update: proxy

deploy_ci/start_env/opservice.yidianzixun.com/start.sh

-rm /home/worker/metro.yidianzixun.com/logs/start_script.done
-cd /home/worker/metro.yidianzixun.com/htdocs/
-mv /opt/project_lib/node_modules /home/worker/metro.yidianzixun.com/htdocs/
+rm /home/worker/opservice.yidianzixun.com/logs/start_script.done
+cd /home/worker/opservice.yidianzixun.com/htdocs/
+mv /opt/project_lib/node_modules /home/worker/opservice.yidianzixun.com/htdocs/
 
 env=$1
 port=$2
@@ -12,17 +12,17 @@ if [ $env != "" ]; then
 fi
 
 if [ X"$port" = X];then
-    $port=8066
+    $port=8055
 fi
 
-cd /home/worker/metro.yidianzixun.com/htdocs/
+cd /home/worker/opservice.yidianzixun.com/htdocs/
 
 if [ X"$env" = X"prod" ];then
     echo "{\"pm2-logrotate\":{\"max_size\":\"524288000\",\"interval\":\"7\",\"retain\":\"10\"},\"module-db\":{\"pm2-logrotate\":true}}" > /root/.pm2/module_conf.json
-    port=8066
+    port=8055
     pm2 start pm2.json
 else
-    PORT=$port NODE_ENV=$env pm2 start index.js --name 'metro' --watch
+    PORT=$port NODE_ENV=$env pm2 start app.js --name 'opwebservice' --watch
 fi
 
 while true; do
@@ -34,6 +34,6 @@ while true; do
     sleep 10;
 done
 
-touch /home/worker/metro.yidianzixun.com/logs/start_script.done
+touch /home/worker/opservice.yidianzixun.com/logs/start_script.done
 while true;do
 sleep 30;done

server/config.js

 const env = process.env.NODE_ENV || 'development';
-const port = process.env.PORT || 8066;
+const port = process.env.PORT || 8055;
 
 const LOGIN_URI = {
   'development': "http://web-rest.int.yidian-inc.com",
@@ -8,9 +8,9 @@ const LOGIN_URI = {
 }
 
 const API_INTERNAL_URI = {
-  'development': "",
-  'test': "",
-  'production': ""
+  'development': "bp-test.ini.yidian-inc.com ",
+  'test': "bp-test.ini.yidian-inc.com ",
+  'production': "bp-test.go2yd.com "
 }
 
 module.exports = {

server/controllers/user.js

@@ -2,14 +2,18 @@ const { API_INTERNAL_URI } = require('../config.js')
 
 var query = {
   async get_permissions(ctx, next) {
-    const url = `${API_INTERNAL_URI}/api/v1/pandora/auth`;
+    // http://bp-test.ini.yidian-inc.com/merchant/authority/get_role_list?user_email=jianghaiming@126.com
+    const url = `${API_INTERNAL_URI}/merchant/authority/get_role_list`;
+    const { email } = ctx.request.query;
     const opts = {
       url,
-      method: 'POST',
-      json: true,
-      body: ctx.request.body
+      method: 'GET',
+      params: {
+        email
       }
     }
+    ctx.body = await req(ctx, opts)
+  }
 }
 
 exports.query = async (ctx, next) => {

server/router.js

 const Router = require('koa-router');
 const system = require('./controllers/system')
-// const index = require('./controllers/index');
-// const about = require('./controllers/about');
-// const api = require('./controllers/api/index');
-// const apiPosts = require('./controllers/api/posts');
+const user = require('./controllers/user')
 
 const router = Router();
+const API_VERSION = "/api/v1";
 
-router.post('/login', system.login);
-
+router.post(`${API_VERSION}/login`, system.login);
+router.get(`${API_VERSION}/user/:type`, user.query)
 
 module.exports = router;

src/App.vue

@@ -9,11 +9,27 @@
 <script>
 // Layout 为布局组件，控制页面基础布局，通过 slot 实现
 // import Layout from '@/layouts';
+// import { fetchCurrentUser } from './services/user';
+
+// async function isUserLogged() {
+//   return (await fetchCurrentUser()).status === 'success';
+// }
+
+// function redirectToLogin() {
+//   const loginUrl = '//pandora.yidian-inc.com/tools/admin/login';
+//   const cbUrl = location.href;
+//   location.href = `${loginUrl}?callback=${cbUrl}`;
+// }
 
 export default {
   // components: {
   //   Layout,
   // },
+  // async mounted() {
+  //   if (!(await isUserLogged())) {
+  //     redirectToLogin();
+  //   }
+  // },
 };
 </script>
 

src/components/PageHeader/index.vue

@@ -30,7 +30,7 @@ export default {
   data () {
     return {
       menuItems,
-      basicPath: "/app/op-management",
+      basicPath: "/",
     };
   },
   computed: {

src/pm2.json

+{
+  "apps": [
+    {
+      "name": "opwebservice",
+      "script": "index.js",
+      "log_date_format": "YYYY-MM-DD HH:mm Z",
+      "cwd": "/home/worker/opservice.yidianzixun.com/htdocs",
+      "exec_mode": "cluster",
+      "instances": 0,
+      "error_file": "/home/worker/opservice.yidianzixun.com/logs/opwebservice.err.log",
+      "out_file": "/home/worker/opservice.yidianzixun.com/logs/opwebservice.out.log",
+      "max_memory_restart": "1G",
+      "env": {
+        "NODE_ENV": "production",
+        "PORT": "8055"
+      }
+    }
+  ]
+}

src/service/common.js

 import axios from '../utils/request';
 
 export async function userLogin(email, password) {
-  let res = await axios.post(`api/login`, {
+  let res = await axios.post(`api/v1/login`, {
     email, password, authCode: ''
   });
   return res.data;

src/service/user.js

 import axios from '../utils/request';
 
 export async function login(email, password) {
-  const res = await axios.post(`api/login`, {
+  const res = await axios.post(`api/v1/login`, {
     email, password, authCode: ''
   });
   return res.data;

vue.config.js

@@ -5,16 +5,18 @@ const isDev = process.env.NODE_ENV === 'development';
 module.exports = {
   outputDir: isDev
     ? './dist'
-    : path.resolve('../../../www/dist/app/'),
-  publicPath: isDev ? '/' : '/dist/',
+    : path.resolve('../../../www/dist/'),
+  publicPath: isDev ? '' : '/dist/',
   configureWebpack: {
     devServer: {
-      proxy: {
-        '/api': {
-          target: 'http://localhost:8055',
-          changeOrigin: true,
-        },
-      },
+      // proxy: {
+      //   '/api': {
+      //     target: 'http://localhost:8055',
+      //     // pathRewrite: { '^/api': '/api/v1' },
+      //     changeOrigin: true,
+      //   },
+      // },
+      proxy: 'http://localhost:8055'
     },
   },
   chainWebpack: config => {