Skip to content

L
loit-build-common
提交 fc0d10ca authored 作者: chenshiying's avatar chenshiying
浏览文件
操作

[新增] 配置修改

上级 74185cb7
隐藏空白字符变更
内嵌 并排
正在显示 包含 97 行增加 和 60 行删除
loit-build-component/loit-build-deploy-env/READEME.md
浏览文件 @ fc0d10ca
...@@ -133,3 +133,9 @@ curl -X POST -u admin:adminloit -H "Content-Type:application/xml" -H "Jenkins-Cr ...@@ -133,3 +133,9 @@ curl -X POST -u admin:adminloit -H "Content-Type:application/xml" -H "Jenkins-Cr
9、批量更新拉取git构建上传批量更新jenkinsjob 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) 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)
10、代办
rm -rf /var/jenkins_home/.m2/repository/com/loit/*
ls -la /var/jenkins_home/.m2/repository/com/loit/
loit-build-component/loit-build-deploy-env/src/main/java/com/loit/common/script/GeneratorDeployJobScript.java
浏览文件 @ fc0d10ca
...@@ -50,6 +50,12 @@ public class GeneratorDeployJobScript { ...@@ -50,6 +50,12 @@ public class GeneratorDeployJobScript {
} }
for (DeployInfoDataDTO grayVersionDataDTO : grayVersionDataDTOList) { for (DeployInfoDataDTO grayVersionDataDTO : grayVersionDataDTOList) {
String needCreateInstanceSql = grayVersionDataDTO.getNeedCreateInstanceSql();
if ("no".equals(needCreateInstanceSql)) {
continue;
}
buildInitEnv(grayVersionDataDTO); buildInitEnv(grayVersionDataDTO);
} }
......
loit-build-component/loit-build-deploy-env/src/main/java/com/loit/common/script/GeneratorGitJobScript.java
浏览文件 @ fc0d10ca
...@@ -54,6 +54,11 @@ public class GeneratorGitJobScript { ...@@ -54,6 +54,11 @@ public class GeneratorGitJobScript {
//对前端实例进行分组 //对前端实例进行分组
for (DeployInfoDataDTO deployDataDTO : grayVersionDataDTOList) { for (DeployInfoDataDTO deployDataDTO : grayVersionDataDTOList) {
String needCreateInstanceSql = deployDataDTO.getNeedCreateInstanceSql();
if ("no".equals(needCreateInstanceSql)) {
continue;
}
BackendFrontEnum backendFrontType = BackendFrontEnum.getEnumByCode(deployDataDTO.getBackendFrontType()); BackendFrontEnum backendFrontType = BackendFrontEnum.getEnumByCode(deployDataDTO.getBackendFrontType());
......
loit-build-component/loit-build-deploy-env/src/main/java/com/loit/common/script/GeneratorPushScript.java
浏览文件 @ fc0d10ca
...@@ -55,6 +55,12 @@ public class GeneratorPushScript { ...@@ -55,6 +55,12 @@ public class GeneratorPushScript {
//对前端实例进行分组 //对前端实例进行分组
for (DeployInfoDataDTO deployDataDTO : grayVersionDataDTOList) { for (DeployInfoDataDTO deployDataDTO : grayVersionDataDTOList) {
String needCreateInstanceSql = deployDataDTO.getNeedCreateInstanceSql();
if ("no".equals(needCreateInstanceSql)) {
continue;
}
BackendFrontEnum backendFrontType = BackendFrontEnum.getEnumByCode(deployDataDTO.getBackendFrontType()); BackendFrontEnum backendFrontType = BackendFrontEnum.getEnumByCode(deployDataDTO.getBackendFrontType());
......
loit-build-component/loit-build-deploy-env/src/main/java/com/loit/common/script/GeneratorScript.java
浏览文件 @ fc0d10ca
...@@ -68,6 +68,11 @@ public class GeneratorScript { ...@@ -68,6 +68,11 @@ public class GeneratorScript {
//对前端实例进行分组 //对前端实例进行分组
for (DeployInfoDataDTO deployDataDTO : grayVersionDataDTOList) { for (DeployInfoDataDTO deployDataDTO : grayVersionDataDTOList) {
String needCreateInstanceSql = deployDataDTO.getNeedCreateInstanceSql();
if ("no".equals(needCreateInstanceSql)) {
continue;
}
BackendFrontEnum backendFrontType = BackendFrontEnum.getEnumByCode(deployDataDTO.getBackendFrontType()); BackendFrontEnum backendFrontType = BackendFrontEnum.getEnumByCode(deployDataDTO.getBackendFrontType());
if (BackendFrontEnum.BACKEND.equals(backendFrontType)) { if (BackendFrontEnum.BACKEND.equals(backendFrontType)) {
continue; continue;
...@@ -83,6 +88,7 @@ public class GeneratorScript { ...@@ -83,6 +88,7 @@ public class GeneratorScript {
frontInstanceDto.setServiceNameSub(serviceNameSub); frontInstanceDto.setServiceNameSub(serviceNameSub);
frontInstanceDto.setServiceNameCookie(serviceNameCookie); frontInstanceDto.setServiceNameCookie(serviceNameCookie);
frontInstanceDto.setServiceNameAbb(deployDataDTO.getServiceNameAbb()); frontInstanceDto.setServiceNameAbb(deployDataDTO.getServiceNameAbb());
frontInstanceDto.setBackendFrontType(backendFrontType);
frontInstanceDtoMap.put(serviceName, frontInstanceDto); frontInstanceDtoMap.put(serviceName, frontInstanceDto);
} }
...@@ -111,6 +117,8 @@ public class GeneratorScript { ...@@ -111,6 +117,8 @@ public class GeneratorScript {
model.put("serviceNameAbb", frontInstanceDto.getServiceNameAbb()); model.put("serviceNameAbb", frontInstanceDto.getServiceNameAbb());
model.put("grayList", frontInstanceDto.getGrayList()); model.put("grayList", frontInstanceDto.getGrayList());
model.put("normalList", frontInstanceDto.getNormalList()); model.put("normalList", frontInstanceDto.getNormalList());
model.put("backendFrontType", frontInstanceDto.getBackendFrontType().getCode());
//创建政务网nginx配置 //创建政务网nginx配置
buildFrontZwwNginxConfig(model); buildFrontZwwNginxConfig(model);
...@@ -273,7 +281,7 @@ public class GeneratorScript { ...@@ -273,7 +281,7 @@ public class GeneratorScript {
private static void buildFrontZwwNginxConfig(Map model) { private static void buildFrontZwwNginxConfig(Map model) {
String nginxConfigDir = root_path_full + "\\zww-nginx.conf"; String nginxConfigDir = root_path_full + "\\zww-nginx.conf";
FileUtils.appendNewLine(nginxConfigDir, "----------------------------------"+ model.get("serviceName") + "----------------------------------"); FileUtils.appendNewLine(nginxConfigDir, "----------------------------------" + model.get("serviceName") + "----------------------------------");
String nginxConfig = FreeMarkerUtils.process("sh\\zww-nginx-upstream.ftl", model); String nginxConfig = FreeMarkerUtils.process("sh\\zww-nginx-upstream.ftl", model);
FileUtils.appendNewLine(nginxConfigDir, nginxConfig); FileUtils.appendNewLine(nginxConfigDir, nginxConfig);
...@@ -283,7 +291,7 @@ public class GeneratorScript { ...@@ -283,7 +291,7 @@ public class GeneratorScript {
private static void buildFrontHlwNginxConfig(Map model) { private static void buildFrontHlwNginxConfig(Map model) {
String nginxConfigDir = root_path_full + "\\hlw-nginx.conf"; String nginxConfigDir = root_path_full + "\\hlw-nginx.conf";
FileUtils.appendNewLine(nginxConfigDir, "----------------------------------"+ model.get("serviceName") + "----------------------------------"); FileUtils.appendNewLine(nginxConfigDir, "----------------------------------" + model.get("serviceName") + "----------------------------------");
String nginxConfig = FreeMarkerUtils.process("sh\\hlw-nginx-upstream.ftl", model); String nginxConfig = FreeMarkerUtils.process("sh\\hlw-nginx-upstream.ftl", model);
FileUtils.appendNewLine(nginxConfigDir, nginxConfig); FileUtils.appendNewLine(nginxConfigDir, nginxConfig);
} }
......
loit-build-component/loit-build-deploy-env/src/main/resources/template/deploy/jobConfigBackend.ftl
浏览文件 @ fc0d10ca
...@@ -67,36 +67,36 @@ ...@@ -67,36 +67,36 @@
<builders> <builders>
<hudson.tasks.Shell> <hudson.tasks.Shell>
<command> <command>
echo &quot;###################begin start#############&quot; echo &quot;###################begin start#############&quot;
echo &apos;deployName:&apos; + $deployName echo &apos;deployName:&apos; + $deployName
echo &apos;modelServiceName:&apos; + $modelServiceName echo &apos;modelServiceName:&apos; + $modelServiceName
echo &apos;modelVersion:&apos; + $modelVersion echo &apos;modelVersion:&apos; + $modelVersion
echo &apos;projectCode:&apos; + $projectCode echo &apos;projectCode:&apos; + $projectCode
echo &apos;status:&apos;+ $status echo &apos;status:&apos;+ $status
echo &quot;###################end print#############&quot; echo &quot;###################end print#############&quot;
echo &quot;###################begin write#############&quot; echo &quot;###################begin write#############&quot;
rm -rf updowncommand.txt rm -rf updowncommand.txt
echo $status &gt; updowncommand.txt echo $status &gt; updowncommand.txt
echo &quot;###################end write###############&quot; echo &quot;###################end write###############&quot;
ls -la ls -la
if [ &quot;$status&quot; = &quot;deploy&quot; ]; then if [ &quot;$status&quot; = &quot;deploy&quot; ]; then
rm -rf $deployName rm -rf $deployName
destDir=&quot;/home/version/push-jar/${r"${"}projectCode}/${r"${"}modelServiceName}/${r"${"}modelVersion}/${r"${"}deployName}&quot; destDir=&quot;/home/version/push-jar/${r"${"}projectCode}/${r"${"}modelServiceName}/${r"${"}modelVersion}/${r"${"}deployName}&quot;
echo &apos;destDir:&apos; + $destDir echo &apos;destDir:&apos; + $destDir
# copy jar to jenkins container # copy jar to jenkins container
scp root@10.0.120.26:$destDir . scp root@10.0.120.26:$destDir .
echo &quot;################### jar file#############&quot; echo &quot;################### jar file#############&quot;
ls -la ls -la
fi fi
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
...@@ -121,8 +121,10 @@ ...@@ -121,8 +121,10 @@
<noDefaultExcludes>false</noDefaultExcludes> <noDefaultExcludes>false</noDefaultExcludes>
<makeEmptyDirs>false</makeEmptyDirs> <makeEmptyDirs>false</makeEmptyDirs>
<patternSeparator>[, ]+</patternSeparator> <patternSeparator>[, ]+</patternSeparator>
<execCommand>cd ${deployPath} <execCommand>
exec bash ${deployShFileName} start</execCommand> cd ${deployPath}
exec bash ${deployShFileName} start
</execCommand>
<execTimeout>120000</execTimeout> <execTimeout>120000</execTimeout>
<usePty>true</usePty> <usePty>true</usePty>
<useAgentForwarding>false</useAgentForwarding> <useAgentForwarding>false</useAgentForwarding>
......
loit-build-component/loit-build-deploy-env/src/main/resources/template/deploy/jobConfigFront.ftl
浏览文件 @ fc0d10ca
...@@ -67,41 +67,43 @@ ...@@ -67,41 +67,43 @@
<builders> <builders>
<hudson.tasks.Shell> <hudson.tasks.Shell>
<command> <command>
echo &quot;###################begin start#############&quot; echo &quot;###################begin start#############&quot;
echo &apos;deployName:&apos; + $deployName echo &apos;deployName:&apos; + $deployName
echo &apos;modelServiceName:&apos; + $modelServiceName echo &apos;modelServiceName:&apos; + $modelServiceName
echo &apos;modelVersion:&apos; + $modelVersion echo &apos;modelVersion:&apos; + $modelVersion
echo &apos;projectCode:&apos; + $projectCode echo &apos;projectCode:&apos; + $projectCode
echo &apos;status:&apos;+ $status echo &apos;status:&apos;+ $status
echo &quot;###################end print#############&quot; echo &quot;###################end print#############&quot;
echo &quot;###################begin write#############&quot; echo &quot;###################begin write#############&quot;
rm -rf updowncommand.txt rm -rf updowncommand.txt
echo $status &gt; updowncommand.txt echo $status &gt; updowncommand.txt
echo &quot;###################end write###############&quot; echo &quot;###################end write###############&quot;
ls -la ls -la
if [ &quot;$status&quot; = &quot;deploy&quot; ]; then if [ &quot;$status&quot; = &quot;deploy&quot; ]; then
rm -rf $deployName rm -rf $deployName
destDir=&quot;/home/version/push-jar/${r"${"}projectCode}/${r"${"}modelServiceName}/${r"${"}modelVersion}/${r"${"}deployName}&quot; destDir=&quot;/home/version/push-jar/${r"${"}projectCode}/${r"${"}modelServiceName}/${r"${"}modelVersion}/${r"${"}deployName}&quot;
echo &apos;destDir:&apos; + $destDir echo &apos;destDir:&apos; + $destDir
# copy jar to jenkins container # copy jar to jenkins container
scp root@10.0.120.26:$destDir . scp root@10.0.120.26:$destDir .
tempFileName=&quot;${r"${"}deployName}.temp&quot; tempFileName=&quot;${r"${"}deployName}.temp&quot;
rm -rf tempFileName rm -rf tempFileName
echo &quot;###################rename zip#############&quot; echo &quot;###################rename zip#############&quot;
mv $deployName $tempFileName mv $deployName $tempFileName
mv $tempFileName dist.zip mv $tempFileName dist.zip
fi fi
ls -la</command> ls -la
</command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
<publishers> <publishers>
...@@ -124,8 +126,10 @@ ...@@ -124,8 +126,10 @@
<noDefaultExcludes>false</noDefaultExcludes> <noDefaultExcludes>false</noDefaultExcludes>
<makeEmptyDirs>false</makeEmptyDirs> <makeEmptyDirs>false</makeEmptyDirs>
<patternSeparator>[, ]+</patternSeparator> <patternSeparator>[, ]+</patternSeparator>
<execCommand>cd ${deployPath} <execCommand>
exec bash ${deployShFileName} start</execCommand> cd ${deployPath}
exec bash ${deployShFileName} start
</execCommand>
<execTimeout>120000</execTimeout> <execTimeout>120000</execTimeout>
<usePty>true</usePty> <usePty>true</usePty>
<useAgentForwarding>false</useAgentForwarding> <useAgentForwarding>false</useAgentForwarding>
......
loit-build-component/loit-build-deploy-env/src/main/resources/template/sh/hlw-nginx-upstream.ftl
浏览文件 @ fc0d10ca
upstream sone.${serviceNameSub}.web { upstream sone.${serviceNameSub}.${backendFrontType} {
server 192.169.201.191:80 weight=5 max_fails=5 fail_timeout=30s; server 192.169.201.191:80 weight=5 max_fails=5 fail_timeout=30s;
server 192.169.201.111:80 weight=5 max_fails=5 fail_timeout=30s; server 192.169.201.111:80 weight=5 max_fails=5 fail_timeout=30s;
server 192.169.201.184:80 weight=5 max_fails=5 fail_timeout=30s; server 192.169.201.184:80 weight=5 max_fails=5 fail_timeout=30s;
} }
location /${serviceNameAbb} { location /${serviceNameAbb} {
proxy_pass http://sone.${serviceNameSub}.web; proxy_pass http://sone.${serviceNameSub}.${backendFrontType};
proxy_set_header HOST $host; proxy_set_header HOST $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
......
loit-build-component/loit-build-deploy-env/src/main/resources/template/sh/zww-nginx-upstream.ftl
浏览文件 @ fc0d10ca
upstream sone.${serviceNameSub}.gray.web { upstream sone.${serviceNameSub}.gray.${backendFrontType} {
least_conn; least_conn;
<#list grayList as gray> <#list grayList as gray>
server ${gray} weight=5 max_fails=5 fail_timeout=30s; server ${gray} weight=5 max_fails=5 fail_timeout=30s;
</#list> </#list>
} }
upstream sone.${serviceNameSub}.normal.web { upstream sone.${serviceNameSub}.normal.${backendFrontType} {
least_conn; least_conn;
<#list normalList as normal> <#list normalList as normal>
server ${normal} weight=5 max_fails=5 fail_timeout=30s; server ${normal} weight=5 max_fails=5 fail_timeout=30s;
</#list> </#list>
} }
upstream sone.${serviceNameSub}.all.web { upstream sone.${serviceNameSub}.all.${backendFrontType} {
<#list grayList as gray> <#list grayList as gray>
server ${gray} weight=5 max_fails=5 fail_timeout=30s; server ${gray} weight=5 max_fails=5 fail_timeout=30s;
</#list> </#list>
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
} }
if ($gray_url = "normal"){ if ($gray_url = "normal"){
proxy_pass http://sone.${serviceNameSub}.normal.web; proxy_pass http://sone.${serviceNameSub}.normal.${backendFrontType};
} }
if ($gray_url = "gray"){ if ($gray_url = "gray"){
proxy_pass http://sone.${serviceNameSub}.gray.web; proxy_pass http://sone.${serviceNameSub}.gray.${backendFrontType};
} }
if ($gray_url ~* ^(.*?)\.(.*?)\.(.*?)$){ if ($gray_url ~* ^(.*?)\.(.*?)\.(.*?)$){
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
} }
if ($gray_url = ''){ if ($gray_url = ''){
proxy_pass http://sone.${serviceNameSub}.all.web; proxy_pass http://sone.${serviceNameSub}.all.${backendFrontType};
} }
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论