Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qa-deploy-utils
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QA
qa-deploy-utils
Commits
ea78e8f9
Commit
ea78e8f9
authored
Jan 18, 2018
by
tywldx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
9cc2cfa7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
get_project_config_server.js
qa_shell_script/config_server/get_project_config_server.js
+4
-4
remove.sh
qa_shell_script/ngrok/remove.sh
+6
-0
No files found.
qa_shell_script/config_server/get_project_config_server.js
View file @
ea78e8f9
...
@@ -75,7 +75,7 @@ admin.post('/add_new_proxy', function (req, res) {
...
@@ -75,7 +75,7 @@ admin.post('/add_new_proxy', function (req, res) {
let
newstr
=
""
,
sourcestr
;
let
newstr
=
""
,
sourcestr
;
if
(
index
!=
-
1
){
if
(
index
!=
-
1
){
//存在这个配置,判断是否是原有的IP
//存在这个配置,判断是否是原有的IP
var
reg
=
new
RegExp
(
request
[
"
namespace
"
]
+
"
\\
|
\\
d*
\\
.
\\
d*
\\
.
\\
d*
\\
.
\\
d*
"
);
var
reg
=
new
RegExp
(
request
[
"
namespace
"
]
+
"
\\
|
\\
d*
\\
.
\\
d*
\\
.
\\
d*
\\
.
\\
d*
|
\
S*
"
);
try
{
try
{
sourcestr
=
str
.
match
(
reg
);
sourcestr
=
str
.
match
(
reg
);
sourcestr
=
sourcestr
[
0
]
sourcestr
=
sourcestr
[
0
]
...
@@ -110,7 +110,7 @@ admin.post('/add_new_proxy', function (req, res) {
...
@@ -110,7 +110,7 @@ admin.post('/add_new_proxy', function (req, res) {
}
}
newstr
=
newstr
.
replace
(
/
\n
/
,
""
);
newstr
=
newstr
.
replace
(
/
\n
/
,
""
);
execSync
(
`echo "
${
newstr
}
" > ../ngrok/docker_env_name.sh`
)
execSync
(
`echo "
${
newstr
}
" > ../ngrok/docker_env_name.sh`
)
cproc
.
exec
(
"
../ngrok/make_frp_ini.sh
"
);
cproc
.
exec
(
"
../ngrok/make_frp_ini
_V2
.sh
"
);
res
.
send
({
msg
:
"
执行完成
"
});
res
.
send
({
msg
:
"
执行完成
"
});
});
});
...
@@ -118,7 +118,7 @@ admin.post('/remove_proxy', function (req, res) {
...
@@ -118,7 +118,7 @@ admin.post('/remove_proxy', function (req, res) {
let
request
=
req
.
body
;
let
request
=
req
.
body
;
var
str
=
String
(
execSync
(
`cat ../ngrok/docker_env_name.sh`
)).
replace
(
/
\n
/
,
""
);
var
str
=
String
(
execSync
(
`cat ../ngrok/docker_env_name.sh`
)).
replace
(
/
\n
/
,
""
);
var
sourcestr
;
var
sourcestr
;
var
reg
=
new
RegExp
(
request
[
"
namespace
"
]
+
"
\\
|
\\
d*
\\
.
\\
d*
\\
.
\\
d*
\\
.
\\
d*
"
);
var
reg
=
new
RegExp
(
request
[
"
namespace
"
]
+
"
\\
|
\\
d*
\\
.
\\
d*
\\
.
\\
d*
\\
.
\\
d*
|
\
S*
"
);
try
{
try
{
sourcestr
=
str
.
replace
(
reg
,
""
);
sourcestr
=
str
.
replace
(
reg
,
""
);
}
catch
(
e
){
}
catch
(
e
){
...
@@ -126,7 +126,7 @@ admin.post('/remove_proxy', function (req, res) {
...
@@ -126,7 +126,7 @@ admin.post('/remove_proxy', function (req, res) {
return
return
}
}
execSync
(
`echo "
${
sourcestr
}
" > ../ngrok/docker_env_name.sh`
);
execSync
(
`echo "
${
sourcestr
}
" > ../ngrok/docker_env_name.sh`
);
cproc
.
exec
(
"
../ngrok/make_frp_ini.sh
"
);
cproc
.
exec
(
`../ngrok/remove.sh
${
request
[
"
namespace
"
]}
`
);
res
.
setHeader
(
"
Content-Type
"
,
"
application/json
"
);
res
.
setHeader
(
"
Content-Type
"
,
"
application/json
"
);
var
str
=
execSync
(
`cat ../ngrok/docker_env_name.sh`
)
var
str
=
execSync
(
`cat ../ngrok/docker_env_name.sh`
)
...
...
qa_shell_script/ngrok/remove.sh
0 → 100755
View file @
ea78e8f9
#!/bin/bash
nginxname
=
"/usr/local/openresty/nginx/conf/conf.d"
rm
-rf
$nginxname
/
$1
.conf
nginx
-s
reload
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment