版本

code/web/client/src/layout/actions/index.js

@@ -1,9 +1,9 @@
 'use strict';
 
 import * as global from './global'
-import * as socket from './webSocket';
+// import * as socket from './webSocket';
 
 export default {
     ...global,
-    ...socket,
+   //  ...socket,
 };

code/web/client/src/layout/actions/webSocket.js

@@ -1,33 +1,33 @@
 'use strict';
 import io from 'socket.io-client';
 
-export const INIT_WEB_SOCKET = 'INIT_WEB_SOCKET'
+// export const INIT_WEB_SOCKET = 'INIT_WEB_SOCKET'
-export function initWebSocket ({ ioUrl, token }) {
+// export function initWebSocket ({ ioUrl, token }) {
-   if (!ioUrl) {
+//    if (!ioUrl) {
-      ioUrl = localStorage.getItem('apiRoot')
+//       ioUrl = localStorage.getItem('apiRoot')
-   }
+//    }
-   if (!token) {
+//    if (!token) {
-      const user = sessionStorage.getItem('user')
+//       const user = sessionStorage.getItem('user')
-      if (user) {
+//       if (user) {
-         token = JSON.parse(user).token
+//          token = JSON.parse(user).token
-      }
+//       }
-   }
+//    }
-   if (!ioUrl || !token) {
+//    if (!ioUrl || !token) {
-      return {
+//       return {
-         type: '',
+//          type: '',
-      }
+//       }
-   }
+//    }
-   return dispatch => {
+//    return dispatch => {
-      const socket = io(ioUrl, {
+//       const socket = io(ioUrl, {
-         query: {
+//          query: {
-            token: token
+//             token: token
-         },
+//          },
-      });
+//       });
-      dispatch({
+//       dispatch({
-         type: INIT_WEB_SOCKET,
+//          type: INIT_WEB_SOCKET,
-         payload: {
+//          payload: {
-            socket: socket
+//             socket: socket
-         }
+//          }
-      })
+//       })
-   }
+//    }
-}
+// }

code/web/client/src/layout/components/header/index.jsx

@@ -4,7 +4,7 @@ import { connect } from "react-redux";
 import { Nav, Avatar, Dropdown } from "@douyinfe/semi-ui";
 
 const Header = (props) => {
-    const { dispatch, history, user, actions, socket } = props;
+    const { dispatch, history, user, actions, } = props;
 
     return (
         <>
@@ -13,9 +13,9 @@ const Header = (props) => {
                 onClick={({ itemKey }) => {
                     if (itemKey == "logout") {
                         dispatch(actions.auth.logout());
-                        if (socket) {
+                        // if (socket) {
-                            socket.disconnect();
+                        //     socket.disconnect();
-                        }
+                        // }
                         history.push(`/signin`);
                     }
                 }}
@@ -64,7 +64,6 @@ const Header = (props) => {
                                 <Avatar size="small" color="light-blue" style={{ margin: 4 }}>
                                     <img src="/assets/images/avatar/6.png" />
                                 </Avatar>
-                                {user && user.namePresent}
                             </div>
                         }
                     >
@@ -77,11 +76,11 @@ const Header = (props) => {
 };
 
 function mapStateToProps (state) {
-    const { global, auth, webSocket } = state;
+    const { global, auth,  } = state;
     return {
         actions: global.actions,
         user: auth.user,
-        socket: webSocket.socket,
+      //   socket: webSocket.socket,
     };
 }
 

code/web/client/src/layout/components/sider/index.jsx

@@ -14,6 +14,7 @@ const Sider = props => {
    useEffect(() => {
       const { sections, dispatch, user } = props;
       let nextItems = []
+      console.log(sections);
       for (let c of sections) {
          if (typeof c.getNavItem == 'function') {
             let item = c.getNavItem(user, dispatch);
@@ -22,6 +23,7 @@ const Sider = props => {
             }
          }
       }
+      console.log(nextItems);
       setItems(nextItems)
 
       const lastSelectedKeys = localStorage.getItem('fs_iot_auth_selected_sider')

code/web/client/src/layout/index.jsx

@@ -15,11 +15,13 @@ import 'moment/locale/zh-cn';
 
 moment.locale('zh-cn');
 
-const { initLayout, initApiRoot, resize, initWebSocket } = layoutActions;
+const { initLayout, initApiRoot, resize, 
+   // initWebSocket 
+} = layoutActions;
 
 const Root = props => {
     const { sections, title, copyright } = props;
-    console.log(sections);
+
     const [history, setHistory] = useState(null)
     const [store, setStore] = useState(null)
     const [outerRoutes, setOuterRoutes] = useState([])
@@ -125,7 +127,7 @@ const Root = props => {
         store.dispatch(initLayout(title, copyright, sections, actions));
         store.dispatch(resize(document.body.clientHeight, document.body.clientWidth));
         store.dispatch(actions.auth.initAuth());
-        store.dispatch(initWebSocket({}))
+      //   store.dispatch(initWebSocket({}))
         store.dispatch(initApiRoot())
 
         const combineRoutes = flatRoutes(innerRoutes);

code/web/client/src/layout/reducers/index.js

@@ -7,11 +7,11 @@
 'use strict';
 
 import global from './global';
-import webSocket from './webSocket'
+// import webSocket from './webSocket'
 import ajaxResponse from './ajaxResponse';
 
 export default {
     global,
-    webSocket,
+   //  webSocket,
     ajaxResponse,
 };

code/web/client/src/layout/reducers/webSocket.js

@@ -1,21 +1,21 @@
-'use strict';
+// 'use strict';
-import * as actionTypes from '../actions/webSocket';
+// import * as actionTypes from '../actions/webSocket';
-import Immutable from 'immutable';
+// import Immutable from 'immutable';
 
-const initState = {
+// const initState = {
-    socket: null,
+//     socket: null,
-};
+// };
 
-function webSocket (state = initState, action) {
+// function webSocket (state = initState, action) {
-    const payload = action.payload;
+//     const payload = action.payload;
-    switch (action.type) {
+//     switch (action.type) {
-        case actionTypes.INIT_WEB_SOCKET:
+//         case actionTypes.INIT_WEB_SOCKET:
-            return Immutable.fromJS(state).merge({
+//             return Immutable.fromJS(state).merge({
-                socket: payload.socket,
+//                 socket: payload.socket,
-            }).toJS();
+//             }).toJS();
-        default:
+//         default:
-            return state;
+//             return state;
-    }
+//     }
-}
+// }
 
-export default webSocket;
+// export default webSocket;

code/web/client/src/sections/auth/actions/auth.js

@@ -42,7 +42,7 @@ export function login (username, password) {
         return Request.post(ApiTable.login, { username, password })
             .then(user => {
                 sessionStorage.setItem('user', JSON.stringify(user));
-                localStorage.setItem('fs_iot_cross_user', JSON.stringify(user));
+               //  localStorage.setItem('fs_iot_cross_user', JSON.stringify(user));
                 return dispatch({
                     type: LOGIN_SUCCESS,
                     payload: { user: user },
@@ -66,7 +66,7 @@ export function logout () {
         token: user.token
     });
     sessionStorage.removeItem('user');
-    localStorage.removeItem('fs_iot_cross_user');
+   //  localStorage.removeItem('fs_iot_cross_user');
     return {
         type: LOGOUT
     };

code/web/client/src/sections/auth/containers/cross.jsx

@@ -66,7 +66,7 @@ const Cross = ({ dispatch, actions }) => {
 }
 
 function mapStateToProps (state) {
-    const { global, auth, webSocket } = state;
+    const { global, auth,  } = state;
     return {
         actions: global.actions,
         user: auth.user,

code/web/client/src/sections/auth/containers/login.jsx

@@ -52,7 +52,7 @@ const Login = props => {
                     onSubmit={values => {
                         dispatch(login(values.username, values.password)).then(res => {
                             const data = res.payload.user
-                            dispatch(actions.layout.initWebSocket({ ioUrl: apiRoot, token: data.token }))
+                           //  dispatch(actions.layout.initWebSocket({ ioUrl: apiRoot, token: data.token }))
                         })
                     }}
                     getFormApi={formApi => form.current = formApi}

code/web/client/src/sections/edition/containers/administer.jsx

@@ -9,15 +9,15 @@ const Administer = props => {
    const { dispatch, user, error, actions, apiRoot, isRequesting } = props
 
 
-
    useEffect(() => {
 
+
+
+
    }, [])
 
    return (
-      <div style={{
+      <div style={{}}>
-
-      }}>
          5204620542045204
       </div>
    );

code/web/client/src/sections/edition/index.js

@@ -3,10 +3,13 @@
 import routes from './routes';
 import reducers from './reducers';
 import actions from './actions';
+import { getNavItem } from './nav-item';
 
 export default {
     key: 'edition',
+    name: '版本管理',
     reducers: reducers,
     routes: routes,
-    actions: actions
+    actions: actions,
+    getNavItem: getNavItem
 };

code/web/client/src/sections/edition/nav-item.jsx

@@ -5,8 +5,7 @@ export function getNavItem (user, dispatch) {
    return (
       [
          {
-            itemKey: 'edition', text: 'edition', icon: <IconCode />,
+            itemKey: 'edition', text: '版本管理', icon: <IconCode />, to: '/edition',
-            to: '/edition',
          },
       ]
    );

code/web/client/src/utils/webapi.js

@@ -2,7 +2,7 @@
 
 export const ApiTable = {
     login: 'v1/login',
-    logout: 'logout',
+    logout: 'v1/logout',
 
     crossCheck: 'cross_token/check',
 };