update

deploy/deploy_configs/deploy-config.sh

@@ -3,12 +3,12 @@
 QA_PRE_START_CMD=""                                     #用于测试环境在START_CMDS执行之前执行，一般用来去掉服务启动时候的内存要求。
 
 START_CMDS="cd /home/services/ ; sh start.sh ${TARGET_ENV}"    #进入docker container以后的服务启动命令
-DOCKER_PORT_MAPS="9008:9008"                                                                                                        #宿>主机端口:container内部端口的映射关系
+DOCKER_PORT_MAPS="9012:9012"                                                                                                        #宿>主机端口:container内部端口的映射关系
 DOCKER_VOLUMN_MAPS="~/_logs/${COMPONENT}-${TARGET_ENV}:/home/services/op-web-service/logs"			#宿主机目录和container内部的目录映射关系
 DOCKER_RUN_OPTIONS="--net=host"							#docker启动时候额外的特殊的启动参数
 
 DOCKER_PRESTOP_CMD=""						    #停止容器之前，执行的一些清理操作
-SERVICE_PORT="9008"								#服务的端口
+SERVICE_PORT="9012"								#服务的端口
 DONT_CHECK_PORT='false'                                             #如果服务不启动端口，那么这个设置为false
 
 #只用于线上部署，服务降级命令（纯字符串，使用单括号），如果部署时downgrade_flag设置成true, 则在部署完成后，enable haproxy之前，在部署的container内部执行这个命令

deploy_ci/deploy_configs/deploy-prod-config.sh

@@ -7,7 +7,7 @@ START_CMDS="tar zxf webui_opwebservice_package.tar.gz -C opservice.yidianzixun.c
 CONTAINER_NAMES="webui-opwebservice-${env}"
 
 # Port maps for each container, one map a line, same order with $start_cmds
-DOCKER_PORT_MAPS="9008:8055"
+DOCKER_PORT_MAPS="9012:8055"
 
 # This is for changing container name, remove old containers when deploy new one
 OLD_CONTAINER_NAMES="
@@ -23,10 +23,10 @@ DOCKER_VOLUMN_MAPS="
 # Other docker run options
 DOCKER_RUN_OPTIONS=""
 # Image name
-IMAGE_NAME="docker2.yidian.com:5000/publish/webui-opwebservice-master-${COMMIT_NUMBER}-image"
+IMAGE_NAME="docker2.yidian.com:5000/publish/webui-opwebservice-master-${release_number}-image"
 # This is for stopping container, kill sepicify process inside the container before 'docker stop' and 'docker rm'
 DOCKER_PRESTOP_CMD=""
 # Service port for apitest
-SERVICE_PORT="9008"
+SERVICE_PORT="9012"
 # Service port inside container
 ORIGIN_SERVICE_PORT="8055"

server/config.js

@@ -14,7 +14,7 @@ const PANDORA_URI = {
 }
 
 const API_INTERNAL_URI = {
-  'development': "http://bp-test.ini.yidian-inc.com",
+  'development': "http://bp-dev.ini.yidian-inc.com",
   'test': "http://bp-test.ini.yidian-inc.com",
   'production': "http://bp-test.go2yd.com"
 }

server/controllers/utils.js

@@ -9,8 +9,8 @@ exports.getUserPermission = async (ctx) => {
     url,
     method: "GET",
     qs: {
-      user_email: "jianghaiming@126.com"
-      // user_email: user
+      // user_email: "jianghaiming@126.com"
+      user_email: user
     }
   };
   return await req(ctx, opts);

src/main.js

@@ -15,7 +15,10 @@ import { redirectToLogin } from "./utils/util";
 // 处理路由权限
 router.beforeResolve(async (to, from, next) => {
 
-  if (!to.meta.requireAuth) next();
+  if (!to.meta.requireAuth) {
+    next();
+    return true;
+  }
 
   if (!store.state.permissions) {
     const { status, user } = await fetchCurrentUser();