hookehuyr

fix 修改更新到服务器的方式

...@@ -9,7 +9,27 @@ ...@@ -9,7 +9,27 @@
9 "build-watch": "vite build --watch", 9 "build-watch": "vite build --watch",
10 "build-ts": "vue-tsc --noEmit && vite build", 10 "build-ts": "vue-tsc --noEmit && vite build",
11 "serve": "vite preview", 11 "serve": "vite preview",
12 - "cypress:open": "cypress open" 12 + "cypress:open": "cypress open",
13 + "tar": "tar -czvpf dist.tar.gz front",
14 + "build_tar": "npm run build && npm run tar",
15 + "scp-dev": "scp dist.tar.gz itomix@ipadbiz.cn:/opt/space-dev/f/custom_form",
16 + "dec-dev": "ssh itomix@ipadbiz.cn 'cd /opt/space-dev/f/custom_form && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'",
17 + "scp-oa": "scp dist.tar.gz itomix@ipadbiz.cn:/opt/oa/f/custom_form",
18 + "dec-oa": "ssh itomix@ipadbiz.cn 'cd /opt/oa/f/custom_form && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'",
19 + "scp-mituo": "scp dist.tar.gz itomix@ipadbiz.cn:/opt/mituo/f/custom_form",
20 + "dec-mituo": "ssh itomix@ipadbiz.cn 'cd /opt/mituo/f/custom_form && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'",
21 + "scp-guanzong": "scp dist.tar.gz itomix@ipadbiz.cn:/opt/guanzong/f/custom_form",
22 + "dec-guanzong": "ssh itomix@ipadbiz.cn 'cd /opt/guanzong/f/custom_form && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'",
23 + "scp-xys": "scp -P 12101 dist.tar.gz zhsy@oa.jcedu.org:/home/www/f/custom_form",
24 + "dec-xys": "ssh -p 12101 zhsy@oa.jcedu.org 'cd /home/www/f/custom_form && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'",
25 + "remove_tar": "rm -rf dist.tar.gz",
26 + "remove_dist": "rm -rf front",
27 + "dev_upload": "npm run build_tar && npm run scp-dev && npm run dec-dev && npm run remove_tar && npm run remove_dist",
28 + "oa_upload": "npm run build_tar && npm run scp-oa && npm run dec-oa && npm run remove_tar",
29 + "mituo_upload": "npm run build_tar && npm run scp-mituo && npm run dec-mituo && npm run remove_tar",
30 + "guanzong_upload": "npm run build_tar && npm run scp-guanzong && npm run dec-guanzong && npm run remove_tar",
31 + "xys_upload": "npm run build_tar && npm run scp-xys && npm run dec-xys && npm run remove_tar",
32 + "all_upload": "npm run dev_upload && npm run oa_upload && npm run mituo_upload && npm run guanzong_upload && npm run xys_upload"
13 }, 33 },
14 "dependencies": { 34 "dependencies": {
15 "@vant/area-data": "^1.3.1", 35 "@vant/area-data": "^1.3.1",
......
...@@ -39,26 +39,30 @@ git commit -m '自定义表单-前端网页更新' ...@@ -39,26 +39,30 @@ git commit -m '自定义表单-前端网页更新'
39 git push 39 git push
40 40
41 # 更新其他分支数据 41 # 更新其他分支数据
42 -git checkout master 42 +# git checkout master
43 -git pull origin master 43 +# git pull origin master
44 -git merge --no-edit custom_form 44 +# git merge --no-edit custom_form
45 -git push origin master 45 +# git push origin master
46 46
47 -git checkout guanzong 47 +# git checkout guanzong
48 -git pull origin guanzong 48 +# git pull origin guanzong
49 -git merge --no-edit custom_form 49 +# git merge --no-edit custom_form
50 -git push origin guanzong 50 +# git push origin guanzong
51 51
52 git checkout mituo 52 git checkout mituo
53 git pull origin mituo 53 git pull origin mituo
54 git merge --no-edit custom_form 54 git merge --no-edit custom_form
55 git push origin mituo 55 git push origin mituo
56 56
57 +# ssh -p 22 itomix@ipadbiz.cn '
58 +# cd /opt/oa;
59 +# git pull origin master;
60 +# cd /opt/guanzong;
61 +# git pull origin guanzong;
62 +# cd /opt/mituo;
63 +# git pull origin mituo;
64 +# '
57 ssh -p 22 itomix@ipadbiz.cn ' 65 ssh -p 22 itomix@ipadbiz.cn '
58 - cd /opt/oa;
59 - git pull origin master;
60 - cd /opt/guanzong;
61 - git pull origin guanzong;
62 cd /opt/mituo; 66 cd /opt/mituo;
63 git pull origin mituo; 67 git pull origin mituo;
64 ' 68 '
......