diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..37a7f1e92 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,75 @@ +#!/usr/bin/env groovy +pipeline { + agent any + parameters { + choice(name: 'PROJECT_NAME', choices: ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic'], description: '请选择å�‘布的项目') + } + tools { + jdk 'JDK8' + } + + stages { + stage("Git Checkout") { + steps { + git changelog: false, credentialsId: 'gitlabsecret', poll: false, url: 'http://gitlab.fangjia.com/dev0/main.git' + } + } + stage('Maven Build') { + steps { + script { + def projects = ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic'] + for (def project : projects) { + if (params.PROJECT_NAME == project) { + dir("deliverables/${project}") { + withMaven(globalMavenSettingsConfig: '426b9a25-aa0d-47d3-a24c-8abdfc4421ff') { + sh 'mvn clean package -Dmaven.test.skip=true' + } + } + } + } + } + } + } + stage('Docker Build') { + steps { + script { + def projects = ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic'] + def imagesName = ['fangjiabkoff': 'fangjia-bkoff', 'chafangtong': 'chafangtong', 'fangjia': 'fangjia-coresite', 'fangjiapds': 'fangjia-pds', 'fangjiastatic': 'fangjia-static'] + for (def project : projects) { + if (params.PROJECT_NAME == project) { + dir("projects/${imagesName[project]}") { + withDockerRegistry(credentialsId: 'DockerNexus', url: 'http://192.168.0.19:9012') { + sh "docker build -t 192.168.0.19:9011/${imagesName[project]}:${env.BUILD_TAG.toLowerCase()} ." + withDockerRegistry(credentialsId: 'DockerNexus', url: 'http://192.168.0.19:9011') { + sh "docker push 192.168.0.19:9011/${imagesName[project]}:${env.BUILD_TAG.toLowerCase()}" + } + } + } + } + } + } + } + } + stage('K8S Deploy') { + steps { + script { + def projects = ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic'] + def k8s_config_map = ['fangjiabkoff': 'fangjia-bkoff', 'chafangtong': 'chafangtong', 'fangjia': 'fangjia-coresite', 'fangjiapds': 'fangjia-pds', 'fangjiastatic': 'fangjia-static'] + for (def project : projects) { + if (params.PROJECT_NAME == project) { + dir("deliverables/k8s") { + withKubeConfig([credentialsId: 'K8SSecret', serverUrl: 'https://k8s.fangjia.com:6443']) { + def orgVersion = "${k8s_config_map[project]}:latest" + def nowVersion = "${k8s_config_map[project]}:${env.BUILD_TAG.toLowerCase()}" + sh "sed -i 's/${orgVersion}/${nowVersion}/g' ${k8s_config_map[project]}.yaml" + sh "kubectl apply -f ${k8s_config_map[project]}.yaml" + } + } + } + } + } + } + } + } + +} \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java index 52b1ecb2d..a101d08b2 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java @@ -305,11 +305,11 @@ public class EvaluationAuditController { if(trades!=null && model.getAuditPrice()!=null){ int charge = 0; if(model.getAuditPrice() > 0 && model.getAuditPrice() <= 100){ - charge = 40; + charge = 20; }else if(model.getAuditPrice() > 100 && model.getAuditPrice() <= 300){ - charge = 160; + charge = 70; }else if(model.getAuditPrice() > 300){ - charge = 360; + charge = 80; } trades.setCharge((int) charge); userTradesService.update(trades); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java index 3a51dcc61..5d15317e7 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java @@ -401,11 +401,11 @@ public class YugudanController { double price = model.getPeopleEditPrice(); double charge = 0; if(price > 0 && price <= 100){ - charge = 40; + charge = 20; }else if(price > 100 && price <= 300){ - charge = 160; + charge = 70; }else if(price > 300){ - charge = 360; + charge = 80; } EvaluationAudit audit = evaluationAuditService.findByEvalutionId(String.valueOf(model.getId())); diff --git a/projects/fangjia-bkoff/src/main/webapp/evaluationAudit/list.ftl b/projects/fangjia-bkoff/src/main/webapp/evaluationAudit/list.ftl index efec6b2ea..826290bd0 100644 --- a/projects/fangjia-bkoff/src/main/webapp/evaluationAudit/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/evaluationAudit/list.ftl @@ -316,11 +316,11 @@ var price = new Number(val)*10000 var charge = 0; if(price > 0 && price <= 1000000){ - charge = 40; + charge = 20; }else if(price > 1000000 && price <= 3000000){ - charge = 160; + charge = 70; }else if(price > 3000000){ - charge = 360 + charge = 80; } if(price != 0){ $(id).html(charge+'å…ƒ'); diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java index adfb2c7c8..30aa6763d 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java @@ -25,8 +25,6 @@ import java.util.zip.GZIPOutputStream; import com.hankcs.hanlp.HanLP; import com.hankcs.hanlp.dictionary.py.Pinyin; -import com.sun.javafx.scene.transform.TransformUtils; -import net.sf.json.JSON; import net.sf.json.JSONArray; import net.sf.json.JSONNull; import net.sf.json.JSONObject; @@ -1847,7 +1845,7 @@ public class DataUtil { // // System.out.println(FourUpSixInto("258.393", 2)); - String href = encodePicUrl("62afd81d303c3f827833bb03", "o", "upload"); + String href = encodePicUrl("635240149c21300bba5184e1", "o", "upload"); String link = "http://static.fangjia.com/stc/fs/"+href; System.out.println(link); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java index ccc5285c3..7479e3e02 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java @@ -107,4 +107,11 @@ public class SolutionController { */ public Object paimaiAction(FangjiaModel model){return model;} + /** + * ²ÆÁ¦ÆÀ¼¶½â¾ö·½°¸ + * @param model + * @return + */ + public Object financialAction(FangjiaModel model){return model;} + } diff --git a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl index 323aeb051..b1a1c4956 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl @@ -38,7 +38,9 @@ 行业动æ€� æ•°æ�®åˆ†æž� æˆ�功案例 - å…¬å�¸åЍæ€� + å�„路客 + 房价通 + 地数 diff --git a/projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl b/projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl index f84257629..6b362fba0 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl @@ -32,6 +32,7 @@
  • 行业ä¼�业
  • 咨询研究
  • å�¸æ³•æ‹�å�–
  • +
  • 财力评级