Skip to content

L
loit-build-common
提交 c8a7277d authored 作者: 杨文彬's avatar 杨文彬
浏览文件
操作

Merge remote-tracking branch 'origin/master' into dev

# Conflicts: # loit-build-component/loit-build-deploy-env/READEME.md
上级 40650034 8c6a7312
隐藏空白字符变更
内嵌 并排
正在显示 包含 72 行增加 和 13 行删除
loit-build-component/loit-build-deploy-env/READEME.md
浏览文件 @ c8a7277d
......@@ -123,5 +123,12 @@ curl -X POST -u admin:adminloit -H "Content-Type:application/xml" -d "@config-0
curl -X POST -u admin:adminloit -H "Content-Type:application/xml" -H "Jenkins-Crumb:c741b30a13fdbcf9f1db6c93365672f082c4d8e2bb88e2f5cf0fc51c758814cc" -d "@demo/freestyle/config.xml" http://localhost:32002/createItem?name=free_style_job
9、批量更新拉取git构建上传批量更新jenkinsjob
UPDATE loit_model_version t SET t.upload_type='0',t.code_branch="origin/test",t.jenkins_job=(SELECT CONCAT('loit-git-branch-',SUBSTRING(model_service_name,6),"-module-build") FROM loit_project_model m WHERE m.model_id=t.model_id)
\ No newline at end of file
# 前端转发路径修改
移动门户
# gateway
loit-build-component/loit-build-deploy-env/src/main/java/com/loit/common/script/GeneratorScript.java
浏览文件 @ c8a7277d
......@@ -55,6 +55,10 @@ public class GeneratorScript {
for (DeployInfoDataDTO grayVersionDataDTO : grayVersionDataDTOList) {
String needCreateInstanceSql = grayVersionDataDTO.getNeedCreateInstanceSql();
if ("no".equals(needCreateInstanceSql)) {
continue;
}
buildInitEnv(grayVersionDataDTO);
buildBackendConfig(grayVersionDataDTO);
buildFrontConfig(grayVersionDataDTO);
......
loit-build-component/loit-build-deploy-env/src/main/resources/bin/applicationConfit/sone/loit-duty-report-prod8124.yaml
浏览文件 @ c8a7277d
......@@ -48,7 +48,7 @@ spring:
#Mysql 数据源
datasource:
url: jdbc:mysql://120.27.92.213:3306/loit_duty_report_portal?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
url: jdbc:mysql://10.0.120.198:7063/loit_duty_report_portal?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
type: com.alibaba.druid.pool.DruidDataSource
username: root
password: ADLzRvGY+/voYgTnf7Wok8c6l9YZwtT9o2Rn+zN9bQnVfbJDwATHFlgB82UDFkt3ZfehElz7+BiHqED8fXVZwA==
......
loit-build-component/loit-build-deploy-env/src/main/resources/bin/serverInit/host_ip.txt
浏览文件 @ c8a7277d
......@@ -66,6 +66,13 @@ root Kingsoft123 10.0.120.37
root Kingsoft123 10.0.120.128
root Kingsoft123 10.0.120.135
root Kingsoft123 10.0.120.190
root 1qaz@WSX3edc 10.0.120.118
root 1qaz@WSX3edc 10.0.120.13
root KingSoft123! 10.0.120.78
root Kingsoft123 10.0.120.118
root Kingsoft123 10.0.120.13
root Kingsoft123 10.0.120.78
root Kingsoft123 10.0.120.88
root Kingsoft123 10.0.120.41
root Kingsoft123 10.0.120.121
root Kingsoft123 10.0.120.211
root Kingsoft123 10.0.120.172
root Kingsoft123 10.0.120.217
root Kingsoft123 10.0.120.51
loit-build-component/loit-build-deploy-env/src/main/resources/bin/serverInit/host_ip_check.txt
浏览文件 @ c8a7277d
......@@ -68,3 +68,10 @@
10.0.120.118 root
10.0.120.13 root
10.0.120.78 root
10.0.120.88 root
10.0.120.41 root
10.0.120.121 root
10.0.120.211 root
10.0.120.172 root
10.0.120.217 root
10.0.120.51 root
loit-build-component/loit-build-deploy-env/src/main/resources/bin/serverInit/host_ip_java_check.txt
浏览文件 @ c8a7277d
......@@ -51,3 +51,10 @@
10.0.120.118 root
10.0.120.13 root
10.0.120.78 root
10.0.120.88 root
10.0.120.41 root
10.0.120.121 root
10.0.120.211 root
10.0.120.172 root
10.0.120.217 root
10.0.120.51 root
loit-build-component/loit-build-deploy-env/src/main/resources/bin/serverInit/host_ip_logstash.txt
浏览文件 @ c8a7277d
......@@ -68,3 +68,10 @@
10.0.120.118 root
10.0.120.13 root
10.0.120.78 root
10.0.120.88 root
10.0.120.41 root
10.0.120.121 root
10.0.120.211 root
10.0.120.172 root
10.0.120.217 root
10.0.120.51 root
loit-build-component/loit-build-deploy-env/src/main/resources/bin/serverInit/host_ip_nginx_check.txt
浏览文件 @ c8a7277d
......@@ -54,3 +54,10 @@
10.0.120.118 root
10.0.120.13 root
10.0.120.78 root
10.0.120.88 root
10.0.120.41 root
10.0.120.121 root
10.0.120.211 root
10.0.120.172 root
10.0.120.217 root
10.0.120.51 root
loit-build-component/loit-build-deploy-env/src/main/resources/bin/serverInit/host_ip_push_script.txt
浏览文件 @ c8a7277d
......@@ -54,3 +54,10 @@
10.0.120.118 root
10.0.120.13 root
10.0.120.78 root
10.0.120.88 root
10.0.120.41 root
10.0.120.121 root
10.0.120.211 root
10.0.120.172 root
10.0.120.217 root
10.0.120.51 root
loit-build-component/loit-build-deploy-env/src/main/resources/bin/serverInit/host_ip_skywalking.txt
浏览文件 @ c8a7277d
......@@ -68,3 +68,10 @@
10.0.120.118 root
10.0.120.13 root
10.0.120.78 root
10.0.120.88 root
10.0.120.41 root
10.0.120.121 root
10.0.120.211 root
10.0.120.172 root
10.0.120.217 root
10.0.120.51 root
loit-build-component/loit-build-deploy-env/src/main/resources/template/git/jenkinsJobGitBackend.ftl
浏览文件 @ c8a7277d
......@@ -92,7 +92,7 @@ echo "######################print param end######################"
echo "##################create remore dist begin#############"
destDir="/home/version/push-jar/${r"${"}projectCode}/${r"${"}modelServiceName}/${r"${"}modelVersion}"
destDir="/home/upload/deploy-jar/${r"${"}projectCode}/${r"${"}modelServiceName}/${r"${"}modelVersion}"
echo 'please check destDir is include projectCode、modelServiceName、modelVersion:' + $destDir
if [ -z "$projectCode" ]; then
......@@ -115,7 +115,7 @@ echo 'modelVersion must not be empty'
exit -1
fi
ssh root@192.169.201.14 "
ssh root@192.169.201.206 "
pwd &&
mkdir -p $destDir &&
ls -la $destDir"
......@@ -125,7 +125,7 @@ echo "##################create remore dist end#############"
echo "##################pussing jar begin#############"
scp ${gitBuildSub}${deployJar} root@192.169.201.14:$destDir
scp ${gitBuildSub}${deployJar} root@192.169.201.206:$destDir
echo "##################pussing jar end#############"
</command>
......
loit-build-component/loit-build-deploy-env/src/main/resources/template/git/jenkinsJobGitFront.ftl
浏览文件 @ c8a7277d
......@@ -91,7 +91,7 @@ echo &quot;######################print param end######################&quot;
echo &quot;##################create remore dist begin#############&quot;
destDir=&quot;/home/version/push-jar/${r"${"}projectCode}/${r"${"}modelServiceName}/${r"${"}modelVersion}&quot;
destDir=&quot;/home/upload/deploy-jar/${r"${"}projectCode}/${r"${"}modelServiceName}/${r"${"}modelVersion}&quot;
echo &apos;please check destDir is include projectCode、modelServiceName、modelVersion:&apos; + $destDir
if [ -z &quot;$projectCode&quot; ]; then
......@@ -114,7 +114,7 @@ echo &apos;modelVersion must not be empty&apos;
exit -1
fi
ssh root@192.169.201.14 &quot;
ssh root@192.169.201.206 &quot;
pwd &amp;&amp;
mkdir -p $destDir &amp;&amp;
ls -la $destDir&quot;
......@@ -124,7 +124,7 @@ echo &quot;##################create remore dist end#############&quot;
echo &quot;##################pussing jar begin#############&quot;
scp dist.zip root@192.169.201.14:$destDir
scp dist.zip root@192.169.201.206:$destDir
echo &quot;##################pussing jar end#############&quot;</command>
</hudson.tasks.Shell>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论