Merge branch 'main' of http://123.60.103.97:3000/xuziqiang/SaaS-lib

hx-ai-intelligent/src/config/app.config.ts

@@ -27,10 +27,10 @@ export const appConfig = {
   themeConfig: {
     bgImageUrl: `${import.meta.env.VITE_PUBLIC_PATH}/asset/image/login/background.png`,
   },
-  // userCustomRouterGuard: (to, from, next, whiteNameList, authorizationStore, appConfig) => {
-  //   console.log({ to, from, next, whiteNameList, authorizationStore, appConfig }, 'routeConfig');
-  //   next();
-  // },
+  userCustomRouterGuard: (to, from, next, whiteNameList, authorizationStore, appConfig) => {
+    console.log({ to, from, next, whiteNameList, authorizationStore, appConfig }, 'routeConfig');
+    next();
+  },
 
   // customUpdatePwd: () => import('/@/view/updatePassword/updatePassword.vue'),
 

hx-op/vite.config.ts

@@ -12,7 +12,7 @@ const proxy = {
     changeOrigin: true,
   },
   '/carbon-smart': {
-    target: 'http://192.168.112.144:8224',
+    target: 'http://123.60.103.97:8224',
     changeOrigin: true,
     rewrite: (path) => path.replace(/^\/carbon-smart/, ''),
   },