Startsida Utforska Hjälp
Registrera dig Logga in
usoft
/
saas-platform
1
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

代码提交

hy 7 år sedan
förälder
312874e1f9
incheckning
75350b0939
5 ändrade filer med 21 tillägg och 4 borttagningar
Delad Vy Visa Diff Statistik
  1. 3 0
      frontend/saas-web/app.json
  2. 1 1
      frontend/saas-web/app/view/main/Main.js
  3. 1 1
      frontend/saas-web/app/view/sys/finish/DataList.js
  4. 7 2
      frontend/saas-web/app/view/viewport/ViewportController.js
  5. 9 0
      frontend/saas-web/index.html

+ 3 - 0
frontend/saas-web/app.json
Visa fil 

@@ -295,6 +295,7 @@
 
             "type": "yui"
 
         },
 
         "server": {
 
+            "accountCenter":"https://saas.usoftchina.com",
 
             "basePath": "https://saas-api.usoftchina.com",
 
             "urlPattern": "^\/api\/"
 
         }
 
@@ -305,6 +306,7 @@
 
      */
 
     "testing": {
 
         "server": {
 
+            "accountCenter":"http://192.168.0.181:8000",
 
             "basePath": {
 
                 "https": "https://saas-api-dev.usoftchina.com:5443",
 
                 "http": "http://192.168.0.181:8560"
 
@@ -321,6 +323,7 @@
 
             "delay": 250
 
         },
 
         "server": {
 
+            "accountCenter":"http://192.168.0.181:8000",
 
             "basePath": {
 
                 "https": "https://saas-api-dev.usoftchina.com:5443",
 
                 "http": "http://192.168.0.181:8560"

+ 1 - 1
frontend/saas-web/app/view/main/Main.js
Visa fil 

@@ -140,7 +140,7 @@ Ext.define('saas.view.main.Main', {
 
                             text: '账户中心',
 
                             iconCls:'x-fa fa-user-o sa-navicon',
 
                             handler:function(){
 
-                                window.open('http://www.usoftchina.com','_blank');
 
+                                window.open(Ext.manifest.server.accountCenter,'_blank');
 
                             }
 
                         },{  
                             text: '意见反馈',

+ 1 - 1
frontend/saas-web/app/view/sys/finish/DataList.js
Visa fil 

@@ -84,7 +84,7 @@ Ext.define('saas.view.sys.finish.DataList', {
 
         width : 110.0, 
     },{
 
         text : "操作日期", 
-        width : 150.0, 
+        width : 220.0, 
         format:'Y-m-d H:i:s',
 
         dataIndex : "createTime", 
         xtype:'datecolumn',

+ 7 - 2
frontend/saas-web/app/view/viewport/ViewportController.js
Visa fil 

@@ -117,7 +117,7 @@ Ext.define('saas.view.viewport.ViewportController', {
 
     terminateSession: function() {
 
         this.setRequestToken(null);
 
         this.saveSession(null);
 
-        this.showAuth();
 
+        //this.showAuth();
 
     },
 
 
     saveSession: function(session) {
 
@@ -153,7 +153,12 @@ Ext.define('saas.view.viewport.ViewportController', {
 
             me.originalRoute = Ext.History.getToken();
 
             me.terminateSession();
 
             view.unmask();
 
-            me.redirectTo('login', {replace: true});
 
+            //me.redirectTo('login', {replace: true});
 
+            //跳转到账户中心
 
+            document.getElementsByTagName('iframe')[0].setAttribute('src',getTokenPage());
 
+            const frame = window.frames[window.frames.length - 1];
 
+            frame.postMessage('removeToken','*');
 
+            window.location.href = getAccountPage();
 
         });
 
     },

+ 9 - 0
frontend/saas-web/index.html
Visa fil 

@@ -12,6 +12,15 @@
 
 
     <!-- The line below must be kept intact for Sencha Cmd to build your application -->
 
     <script id="microloader" data-app="a20e1670-7932-41f6-8e9c-55b77cba3f26" type="text/javascript" src="bootstrap.js"></script>
 
+    <script>
 
+        function getTokenPage(){
 
+            return Ext.manifest.server.accountCenter + "/remove-token.html"
 
+        }
 
+        function getAccountPage(){
 
+            return Ext.manifest.server.accountCenter
 
+        }
 
+    </script>
 
 </head>
 
+<iframe hidden></iframe>
 
 <body class="launching"></body>
 
 </html>