增加通用路由

ndcc/server/lib/index.js

@@ -707,23 +707,6 @@ exports.plugin  = {
       }
     });
 
-    // // 会覆盖路由配置，注释掉
-    // //Set api route
-    // server.route({
-    //     method: ['POST','GET'],
-    //     path: '/api/{action*}',
-    //     options:{auth: 'auth'},
-    //     handler: async (request,h) => {
-    //     try {
-    //         const {req,res} = await new Basic(request,server).init();
-    //         await handler(req, res);
-    //         return h.close;
-    //     } catch (e) {
-    //         Error(e);
-    //     }
-    //     }
-    // });
-
     // //web routing must be placed last
     // server.route({
     //     method: 'GET',

ndcc/server/plugins/route.js

@@ -222,7 +222,6 @@ exports.plugin  = {
             })
             return arr;
         }
-
   
         //set custom api and web route
         for(let item of ['api','web']){
@@ -247,5 +246,42 @@ exports.plugin  = {
                 });
             })
         }
+
+        //api通用路由
+        server.route({
+            method: ['GET'],
+            path: '/api/{action*}',
+            options:{auth: 'auth'},
+            handler: async (request,h)=>{
+                try {
+                    request.raw.req.url = `/api/routes/${request.params.action}`;
+                    const {req,res} = await new Basic(request,server).init();
+                    await handler(req, res);
+                    return h.close;
+                } catch (e) {
+                    Error(e)
+                }
+            }
+        });
+
+        // web 通用路由
+        server.route({
+            method: 'GET',
+            path: '/{action*}',
+            handler: async (request, h) => {
+                try {
+                    const url = request.url;
+                    if (/^\/(workbox|worker|fallback)-\w+\.js$/.test(url.pathname)) {    //处理pwa
+                        return h.file(Path.join(process.cwd(), `pwa${url.pathname}`));
+                    }else{
+                        request.url.pathname = `/web/${request.params.action}`;
+                        return await nextHandlerWrapper(request,h);
+                    }
+                } catch (e) {
+                    Error(e.message,'plugins')
+                }
+            }
+        });
+
     }
 };

src/pages/admin/ZhIS8NlvqEJ2bubJ/index.js

@@ -1,6 +1,7 @@
 import style from './style.module.scss';
 import Container from './style';
-export default function App() {
+export default function App(props) {
+    console.log(props,'--')
     return (
         <Container>
            首页待编辑1test

src/pages/api/routes/test8/index.js

@@ -0,0 +1,10 @@
+export default async (req,res)=>{ 
+    
+    const {send,reply,error,isGet,db,user,mongo,query,payload,socket,remoteAddress,method,plugins} = await req.ctx();  
+    try{
+        send('test8');
+    }catch (e){ 
+        console.log('err')
+        error(e)
+    }
+};

src/pages/api/routes/test9/index.js

@@ -0,0 +1,10 @@
+export default async (req,res)=>{ 
+    
+    const {send,reply,error,isGet,db,user,mongo,query,payload,socket,remoteAddress,method,plugins} = await req.ctx();  
+    try{
+        send('test9');
+    }catch (e){ 
+        console.log('err')
+        error(e)
+    }
+};

src/pages/web/index1/index.js

@@ -0,0 +1,10 @@
+
+export async function getServerSideProps({req,res}) {
+    return {
+        props: {}, // will be passed to the page component as props
+    }
+}
+export default () =>{
+
+    return 'index1'
+}