update

HiTeachCE/ClientApp/src/views/Board.vue

@@ -28,7 +28,7 @@
                 <Modal v-model="modalUpload" width="500" :mask-closable="false" style="margin-bottom:100px;bottom:unset !important">
                     <div slot="footer" class="tc ov flex mgt">
                         <div class="upload-box">
-                            <Upload action="/api/file/UploadDocument" :on-success="handleUploadSuc" class="fl"
+                            <Upload action="https://cdhabook.teammodel.cn/api/file/UploadDocument" :on-success="handleUploadSuc" class="fl"
                                     :style="'display: '+pdfRow"
                                     :on-error="handleUploadError"
                                     :accept="Accept"
@@ -258,7 +258,7 @@
         methods: {
             //验证基础数据或重整页面
             init() {
-                if (localStorage.getItem('TWtoken') === null || localStorage.getItem('deviceId') === null || localStorage.getItem('mqtts') === null || localStorage.getItem('loginBack') === null || localStorage.getItem('classNum') === null) {
+                if (localStorage.getItem('usertoken') === null || localStorage.getItem('mqttinfo') === null) {
                     this.$q.loading.show({
                         message: '请登陆！',
                         sanitize: true
@@ -267,17 +267,14 @@
                         this.$router.push('/')
                     }, 4000);
                 }
-                let usertoken = localStorage.getItem('TWtoken')
-                let userdeviceIds = localStorage.getItem('deviceId')
-                let usermqtts = localStorage.getItem('mqtts')
-                let userloginBacks = localStorage.getItem('loginBack')
-                let userclassnums = localStorage.getItem('classNum')
-                if (userdeviceIds !== '' && usertoken !== '' && usermqtts !== '' && userloginBacks !== '' && userclassnums !== '') {
-                    this.$store.state.userLogin.userdeviceid = userdeviceIds
+                let usertoken = localStorage.getItem('usertoken')
+                //let userdeviceIds = localStorage.getItem('deviceId')
+                let usermqtts = localStorage.getItem('mqttinfo')
+                //let userloginBacks = localStorage.getItem('loginBack')
+                //let userclassnums = localStorage.getItem('classNum')
+                if (usertoken !== '' && usermqtts !== '') {
                     this.$store.state.userLogin.token = usertoken
                     this.$store.state.userLogin.usermqtt = usermqtts
-                    this.$store.state.userLogin.userloginBack = userloginBacks
-                    this.$store.state.userLogin.userClassNum = userclassnums
                 }
                 let Fullscreen = localStorage.getItem('Fullscreen')
                 if (Fullscreen === 1) {
@@ -290,51 +287,6 @@
                 }
                 this.StudentPercentage = 0
             },
-            getTMDToken() { // 获取醍摩豆TOKEN
-                let that = this
-                that.loginBack = localStorage.getItem('loginBack')
-                if (!localStorage.getItem('TMDtoken')) {
-                    that.$api.TeamModelLogin(
-                        {
-                            'params': {
-                                'ticket': that.loginBack.ticket,
-                                'name': that.loginBack.name,
-                                'teamModelId': that.loginBack.teamModelId,
-                                'Token': localStorage.getItem('TWtoken'),
-                                'ServiceUrl': JSON.parse(localStorage.getItem('serviceUrl')).api
-                            },
-                            'method': 'api/login/TeamModelLogin',
-                            'lang': 'zh-CN'
-                        }
-                    ).then(res => {
-                        let TMDtoken = res.result.data.access_token
-                        if (TMDtoken) {
-
-                            if (!localStorage.getItem('TMDtoken')) {
-                                localStorage.setItem('TMDtoken', TMDtoken)
-                            }
-                            this.TMDInfo()
-                            that.$Message.success('成功返回醍摩豆token!')
-                        } else {
-                            that.$Message.warning('服务器错误！未返回token')
-                        }
-                    }).catch(res => {
-                        console.log(res)
-                    })
-                }
-            },
-            TMDInfo() { // 获取醍摩豆TOKEN
-                let that = this
-                that.$api.TeamModelInfo(
-                    {
-                        'params': {}
-                    }
-                ).then(res => {
-                    localStorage.setItem('userInfo', JSON.stringify(res.result.data))
-                }).catch(res => {
-
-                })
-            },
             handleUploadSuc(response, file, i) {
                 this.$store.state.uploadUrl = response.result.data.model.blobUrl
                 localStorage.setItem('slide', 1)
@@ -1599,7 +1551,7 @@
             },
             MQTTconnect() {
                 let that = this
-                let mqttInfo = JSON.parse(localStorage.getItem('mqtts'))
+                let mqttInfo = JSON.parse(localStorage.getItem('mqttinfo'))
                 // 连接选项
                 let options = {
                     connectTimeout: 4000, // 超时时间
@@ -1607,9 +1559,9 @@
                     // clientId: '4081392a-2c9d-0189-b973-2614545c156a',
                     // username: 'CoreIoTHub.azure-devices.cn/02aec4f9-e088-db04-673f-e72490a10fbe/api-version=2016-11-14',
                     // password: 'SharedAccessSignature sr=CoreIoTHub.azure-devices.cn%2Fdevices%2F02aec4f9-e088-db04-673f-e72490a10fbe&sig=3uMBMx5bjY3tsf3RiAHALuHGMu6ARJ%2F5u%2B4jzknTNm0%3D&se=1598424728',
-                    clientId: mqttInfo.mqtt.connectInfo.clientID,
-                    username: mqttInfo.mqtt.connectInfo.username,
-                    password: mqttInfo.mqtt.connectInfo.password,
+                    clientId: mqttInfo.connectInfo.clientID,
+                    username: mqttInfo.connectInfo.username,
+                    password: mqttInfo.connectInfo.password,
                     timeout: 3,
                     useSSL: true,
                     cleanSession: true,
@@ -1992,8 +1944,8 @@
                 let msg = this.mqmsg
                 let payload = ''
                 let directMethod = this.responderId
-                let mqttInfo = JSON.parse(localStorage.getItem('mqtts'));
-                let userdeviceId = mqttInfo.mqtt.connectInfo.clientID;
+                let mqttInfo = JSON.parse(localStorage.getItem('mqttinfo'));
+                let userdeviceId = mqttInfo.connectInfo.clientID;
                 let ClassrommNum = localStorage.getItem('classNum')
                 let sendMsg = 'devices/' + userdeviceId + '/messages/events/endpoint=coretopiciot&groupNum=' + ClassrommNum + '&deviceId=' + userdeviceId
                 const timestamp = Math.floor(Date.now() / 1000)
@@ -2437,7 +2389,6 @@
         created() {
             // this.loginCallback();
             this.init();
-            this.getTMDToken()
             this.MQTTconnect()
             // this.TMDInfo();
             // this.question();

HiTeachCE/ClientApp/src/views/Login.vue

@@ -2,17 +2,17 @@
     <div class="login bodyBG">
         <CommonHeader></CommonHeader>
         <div class="login-box pad20 colorF tc">
-        <!--<div class="animated zoomIn">
-            <h2>{{$t('login.loginBox.title')}}</h2>
-            <div class="intro">
-                {{$t('login.loginBox.intro')}}
-            </div>
+            <!--<div class="animated zoomIn">
+        <h2>{{$t('login.loginBox.title')}}</h2>
+        <div class="intro">
+            {{$t('login.loginBox.intro')}}
         </div>
-        <span @click="handleLogin('login')" class="login-btn">
-            {{$t('login.loginBox.loginWord')}}
-            <font-awesome-icon icon="arrow-alt-circle-right" class="fr login-arrow" />
-        </span>
-        <br>-->
+    </div>
+    <span @click="handleLogin('login')" class="login-btn">
+        {{$t('login.loginBox.loginWord')}}
+        <font-awesome-icon icon="arrow-alt-circle-right" class="fr login-arrow" />
+    </span>
+    <br>-->
             <div class="loginbox">
                 <h2>HiTeach CE</h2>
                 <!--注册/登录-->
@@ -96,7 +96,8 @@
                     </div>
                 </Modal>
             </div>
-    </div>
+            <Spin size="large" fix v-if="spinShow"></Spin>
+        </div>
         <div class="footer-logo">
             <a href="/"><img src="../assets/img/logo.png" alt=""></a>
         </div>
@@ -157,7 +158,8 @@
                 modal3:false,
                 modal_loading: false,
                 deviceId: '',
-                classnum:'',
+                classnum: '',
+                spinShow:false,
                 ruleInline: {
                     phonenumber: [
                         { required: true, message: '请填下正确的手机号码', trigger: 'blur' },
@@ -303,7 +305,8 @@
             },
             //CE
             //登录or注册
-            loginSubmit(){
+            loginSubmit() {
+                this.spinShow=true
                 let phonenum = this.formInline.phonenumber
                 let codenums = this.formInline.codenum
                 let phonecode = this.formInline.phonecode
@@ -325,6 +328,7 @@
                         if (res.result.data.status == 1) {
                             this.userinfo = res.result.data
                             console.log(this.userinfo, '赋值过去的值')
+                            this.spinShow = false
                             this.modal2 = true
                         } else {
                             console.log(res)
@@ -341,11 +345,11 @@
                                 if (res.error === null || res.error === '') {
                                     this.organization = res.result.data
                                     console.log(this.organization)
+                                    this.spinShow = false
                                     this.modal3 = true
                                 }
                             })
                             console.log(this.jwtinfo, this.ticket, '已经是老用户了')
-                            
                         }
                     }
                 })
@@ -495,6 +499,7 @@
                     }
                 }).then(res => {
                     if (res.error === null && res.result.message === "Success") {
+                        localStorage.setItem('deveceId', JSON.stringify(this.deviceId))
                         this.createclass(this.deviceId)
                     } else {
                         this.$Message.error('用户初始化错误，请重试');
@@ -513,6 +518,7 @@
                     console.log(res, '创建教室成功')
                     if (res.error === null && res.result.data !== null) {
                         this.classnum = res.result.data
+                        localStorage.setItem('classnum', JSON.stringify(this.classnum))
                         this.joinclass()
                     } else {
                         this.$Message.error('创建教室失败，请重试');
@@ -546,14 +552,6 @@
             // this.loginInfo();
             this.Codeimg();
         },
-        mounted() {
-            this.loginCallback()
-            if (this._isMobile()) {
-                this.$router.push('/moblielogin')
-            } else {
-
-            }
-        }
     }
 </script>
 <style>
@@ -567,6 +565,12 @@
     .ivu-list-item {
         width:100% !important;
     }
+    .ivu-spin-main {
+        top: 40% !important;
+    }
+    .ivu-spin-fix {
+        background:none;
+    }
 </style>
 <style scoped>
     .loginbox {
@@ -644,7 +648,6 @@
             cursor: pointer;
             position: relative;
         }
-
     @media only screen and (max-width: 768px) {
         h2 {
             line-height: 2.5rem;

HiTeachCE/appsettings.Development.json

@@ -72,5 +72,5 @@
     "receiveDirectMethod": "$iothub/methods/POST/directMethod/#",
     "receiveTwin": "$iothub/twin/res/#"
   },
-  "RootUser": [ "15283771540", "18482133094", "19983148070" ]
+  "RootUser": [ "15283771540", "18482133094", "19983148070" ,"18281911681"]
 }

HiTeachCE/appsettings.json

@@ -73,5 +73,5 @@
     "receiveDirectMethod": "$iothub/methods/POST/directMethod/#",
     "receiveTwin": "$iothub/twin/res/#"
   },
-  "RootUser": [ "15283771540", "18482133094", "19983148070" ]
+  "RootUser": [ "15283771540", "18482133094", "19983148070","18281911681" ]
 }