Merge branch 'master' into commodity_mengwehao

Dockerfile

+FROM docker2.yidian.com:5000/webui/op-web-service:20210610
+WORKDIR /opt/project
\ No newline at end of file

README.md

@@ -34,3 +34,17 @@ npm run web-dev
 # 增加顶部导航
 1. 配置 */src/config/pageconfig.js*  HEADER_CONFIG.menuItems 增加对应项
 2. 若需要权限控制顶栏是否展示对应项， 需配置 */src/config/pageconfig.js*  PAGEMODULE_PERMISSIONNAME 模块对应的权限名。权限名需与服务端返回权限列表中的一级权限保持一致
+
+
+# 部署发布流程
+## 测试环境（http://clay.yidian-inc.com）
+待提测代码push test分支。对应下列三个job 打包部署测试环境
+- 1. bp-op-web-service-branch-commit
+- 2. bp-op-web-service-branch-assemble
+- 3. bp-op-web-service-branch-deploy-qa
+
+## 正式环境（http://opservice.int.yidian-inc.com）K8s
+代码push master。
+- 1. bp-op-web-service-master-commit
+- 2. bp-op-web-service-master-assemble
+assemble 完成后, **http://jenkins.yidian-inc.com:8080/job/superfe-bp-opservice/** 填入1 对应的 COMMIT_ID，选择全量发布，部署到生产环境。
\ No newline at end of file

deploy/deploy_configs/assemble-yidian-config.sh

 #!/usr/bin/env bash
 
-PACKAGE_FILE_NAME="*.jar"                                     #commit job生成的包。
+PACKAGE_FILE_NAME="*.tar.gz"                                     #commit job生成的包。
 HOME_DIR_INSIDE_CONTAINER="/home/services"                                     #container中的根目录，SERVICE_DIR所在的目录
-SERVICE_DIR=op-web-service                                     #container中服务所在的目录
+SERVICE_DIR="op-web-service"                                     #container中服务所在的目录
 LOG_DIRS="
 ${HOME_DIR_INSIDE_CONTAINER}/${SERVICE_DIR}/logs
 "															#运行时日志所在目录，会在deploy时map到宿主机的目录下去
-START_SCRIPT="./start_env/start.sh"						#部署完后，启动服务的脚本，相对于start_env的路径。start_env最终会是HOME_DIR_INSIDE_CONTAINER
+START_SCRIPT="./start_env/deploy.sh"						#部署完后，启动服务的脚本，相对于start_env的路径。start_env最终会是HOME_DIR_INSIDE_CONTAINER
 PACKAGE_FILE_PATH="start_env/${SERVICE_DIR}/bin/"             #把package file拷贝到这个目录, 相对于start_env的路径。
-BASE_IMAGE="docker2.yidian.com:5000/centos/compile-jdk8:20150720"						#服务运行的基础镜像
+BASE_IMAGE="docker2.yidian.com:5000/webui/op-web-service:20210610"						#服务运行的基础镜像
 
 #下面的选项一般不用
 SYNC_DATA_OPERATIONS="

deploy/deploy_configs/deploy-config.sh

@@ -2,14 +2,14 @@
 
 QA_PRE_START_CMD=""                                     #用于测试环境在START_CMDS执行之前执行，一般用来去掉服务启动时候的内存要求。
 
-START_CMDS="cd /home/worker/ && sh start.sh ${TARGET_ENV}"    #进入docker container以后的服务启动命令
+START_CMDS="cd /home/services/ ;sh deploy.sh ${TARGET_ENV}"    #进入docker container以后的服务启动命令
 DOCKER_PORT_MAPS="8055:8055"                                                                                                        #宿>主机端口:container内部端口的映射关系
-DOCKER_VOLUMN_MAPS="~/_logs/${COMPONENT}-${TARGET_ENV}:/home/worker/op-web-service/logs"			#宿主机目录和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="8055"								#服务的端口
-DONT_CHECK_PORT='false'                                             #如果服务不启动端口，那么这个设置为false
+DONT_CHECK_PORT='true'                                             #如果服务不启动端口，那么这个设置为false
 
 #只用于线上部署，服务降级命令（纯字符串，使用单括号），如果部署时downgrade_flag设置成true, 则在部署完成后，enable haproxy之前，在部署的container内部执行这个命令
 #如果需要访问自己的某端口，使用, 代替。

deploy/start_env/deploy.sh

+#!/usr/bin/env bash
+
+SERVICE_DIR="op-web-service" # 修改为正确的服务的名称
+
+tar zxf ./${SERVICE_DIR}/bin/${SERVICE_DIR}.tar.gz -C ${SERVICE_DIR}/htdocs
+cd ${SERVICE_DIR}
+sh ./start.sh $1 "8055"
+
+
+
+# while true; do
+#     s=`netstat -ntl | grep ":$port " -c`
+#     echo $s
+#     if [ "X$s" != "X" ] && [ "$s" != "0" ]; then
+#         break
+#     fi
+#     sleep 5;
+# done
+
+# touch ../logs/warmup.done
+# touch ../logs/start_script.done
\ No newline at end of file

deploy/start_env/start.sh → deploy/start_env/op-web-service/start.sh

@@ -5,21 +5,14 @@ mv /opt/project_lib/node_modules /home/services/op-web-service/htdocs/
 env=$1
 port=$2
 
-if [ $env != "" ]; then
-    cd /home/services/recipe/$env
-    sh ./*.rule
-    cd -
-fi
-
-if [ X"$port" = X];then
-    $port=8055
+if [ X"$port" == X"" ];then
+  port=8055
 fi
 
 cd /home/services/op-web-service/htdocs/
 
-if [ X"$env" = X"prod" ];then
+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=8055
     pm2 start pm2.json
 else
     PORT=$port NODE_ENV=$env pm2 start app.js --name 'opwebservice' --watch

package.json

@@ -5,10 +5,11 @@
   "main": "app.js",
   "scripts": {
     "dev": "sh ./bin/start.sh development",
-    "test": "sh ./bin/start.sh testing",
+    "test": "sh ./bin/start.sh test",
     "prod": "sh ./bin/start.sh production",
     "koa": "nodemon app.js",
     "web-dev": "NODE_ENV=development vue-cli-service serve",
+    "web-test": "NODE_ENV=test vue-cli-service build",
     "web-build": "NODE_ENV=production vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint"

pm2.json

@@ -4,11 +4,11 @@
       "name": "opwebservice",
       "script": "app.js",
       "log_date_format": "YYYY-MM-DD HH:mm Z",
-      "cwd": "/home/worker/opservice.yidian-inc.com/htdocs",
+      "cwd": "/home/services/op-web-service/htdocs",
       "exec_mode": "cluster",
       "instances": 0,
-      "error_file": "/home/worker/opservice.yidian-inc.com/logs/opwebservice.err.log",
-      "out_file": "/home/worker/opservice.yidian-inc.com/logs/opwebservice.out.log",
+      "error_file": "/home/services/op-web-service/logs/opwebservice.err.log",
+      "out_file": "/home/services/op-web-service/logs/opwebservice.out.log",
       "max_memory_restart": "1G",
       "env": {
         "NODE_ENV": "production",

server/config.js

 const env = process.env.NODE_ENV || "development";
 const port = process.env.PORT || 8055;
 
-const LOGIN_URI = {
-  'development': "http://bp-test.ini.yidian-inc.com ",
-  'test': "http://web-rest.int.yidian-inc.com",
-  'production': "http://web-rest.int.yidian-inc.com"
-};
-
 const PANDORA_URI = {
   'development': "http://pandora.yidian-inc.com",
   'test': "http://pandora.yidian-inc.com",
@@ -34,7 +28,6 @@ const IDGEN_URI = {
 module.exports = {
   env: env,
   port: port,
-  LOGIN_URI: LOGIN_URI[env],
   API_INTERNAL_URI: API_INTERNAL_URI[env],
   PANDORA_URI: PANDORA_URI[env],
   IDGEN_URI: IDGEN_URI[env],

server/controllers/life-no.js

-const LOGIN_URI = require('../config.js').LOGIN_URI
 const API_INTERNAL_URI = require('../config.js').API_INTERNAL_URI
 //生活号列表
 const req = require('../utils/request').httpReq

server/controllers/role.js

-const LOGIN_URI = require('../config.js').LOGIN_URI
 const API_INTERNAL_URI = require('../config.js').API_INTERNAL_URI
 const req = require('../utils/request').httpReq
 const controller_utils = require('./utils')

src/App.vue

@@ -15,6 +15,7 @@ import { redirectToLogin } from './utils/util';
 
 export default {
   async mounted () {
+    console.log("master debug 2 !!!!!!")
     if (this.$store.state.permissions && this.$store.state.userInfo) return
     const { status, user } = await fetchCurrentUser();
     if (status === 'success') {

src/pages/Enterprise/Audit/index.vue

@@ -196,7 +196,7 @@
           <el-table-column
             align="center"
             label="提交时间"
-            prop="submit_time"
+            prop="update_time"
           ></el-table-column>
           <el-table-column
             align="center"

src/pages/Enterprise/Certification/index.vue

@@ -278,7 +278,6 @@ export default {
 
   created () {
     this.getEnterpriseList();
-    console.log(this.$store);
   },
 
   computed: {
@@ -318,10 +317,9 @@ export default {
         if (res.code !== 0) return this.$message.error(res.reason);
         this.enterpriseList = res.result.data;
         this.totalCount = res.result.count;
-        console.log(res);
       } catch (err) {
         this.$message.error("发生未知错误");
-        console.log(err);
+        console.error(err);
       }
     },
 
@@ -362,7 +360,7 @@ export default {
         if (res.code !== 0) return this.$message.error(res.reason);
         this.$message.success("校验码发送成功,请输入验证码后验证~~~");
       } catch (err) {
-        console.log(err);
+        console.error(err);
       }
     },
     // 校验验证码
@@ -375,7 +373,6 @@ export default {
           code: parseInt(this.checkIsCode)
         };
         const res = await checkCode(parasm);
-        console.log(res);
         if (res.code !== 0) return this.$message.error(res.reason);
         this.$message.success("验证码校验成功!");
         this.$router.push({

src/pages/Enterprise/components/enterpriseForm.vue

@@ -70,7 +70,10 @@
         label="用户手机号："
         prop="mobile"
       >
-        <el-input v-model.trim="establishForm.mobile"></el-input>
+        <el-input
+          :disabled="enterpriseId ? true : false"
+          v-model.trim="establishForm.mobile"
+        ></el-input>
       </el-form-item>
       <!-- =================普通企业法人/个体工商户身份认证信息========== -->
       <h3>身份信息</h3>