diff --git a/app.platform/build-jetty.gradle b/app.platform/build-jetty.gradle index 337e18ac..6cf02057 100644 --- a/app.platform/build-jetty.gradle +++ b/app.platform/build-jetty.gradle @@ -2,7 +2,7 @@ println "[Jetty] 环境 ......" configurations { all*.exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" - all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-coe" + all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core" all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket" } diff --git a/app.platform/build-undertow.gradle b/app.platform/build-undertow.gradle index 2ef429e7..00d3b492 100644 --- a/app.platform/build-undertow.gradle +++ b/app.platform/build-undertow.gradle @@ -2,7 +2,7 @@ println "[Undertow] 环境 ......" configurations { all*.exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" - all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-coe" + all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core" all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket" } diff --git a/app.platform/build.gradle b/app.platform/build.gradle index 2bfede38..c63cef5e 100644 --- a/app.platform/build.gradle +++ b/app.platform/build.gradle @@ -17,7 +17,7 @@ dependencies { project(":io.sc.engine.mv.frontend"), project(":io.sc.engine.mv.sample"), - //project(":io.sc.platform.job.coe"), + //project(":io.sc.platform.job.core"), //project(":io.sc.platform.job.executor"), //project(":io.sc.platform.job.manager"), diff --git a/io.sc.engine.mv.frontend/src/i18n/messages.json b/io.sc.engine.mv.frontend/src/i18n/messages.json index 561b9603..5932ba18 100644 --- a/io.sc.engine.mv.frontend/src/i18n/messages.json +++ b/io.sc.engine.mv.frontend/src/i18n/messages.json @@ -159,12 +159,14 @@ "io.sc.engine.mv.result.curve.ks.y1" : "(Y1)Percent of normal", "io.sc.engine.mv.result.curve.ks.y2" : "(Y2)Percent of defaults", + "io.sc.engine.mv.result.chiSquare.grid.title" : "ChiSquare Test", "io.sc.engine.mv.result.chiSquare.level" : "Level", "io.sc.engine.mv.result.chiSquare.pd" : "PD", "io.sc.engine.mv.result.chiSquare.count" : "Total Count", "io.sc.engine.mv.result.chiSquare.defaultCount" : "Default Count", "io.sc.engine.mv.result.chiSquare.chiSquare" : "ChiSquare Value", + "io.sc.engine.mv.result.binomial.grid.title" : "Binomial Test", "io.sc.engine.mv.result.binomial.level" : "Level", "io.sc.engine.mv.result.binomial.pd" : "PD", "io.sc.engine.mv.result.binomial.count" : "Total Count", diff --git a/io.sc.engine.mv.frontend/src/i18n/messages_tw_CN.json b/io.sc.engine.mv.frontend/src/i18n/messages_tw_CN.json index e6055c98..9bdb5497 100644 --- a/io.sc.engine.mv.frontend/src/i18n/messages_tw_CN.json +++ b/io.sc.engine.mv.frontend/src/i18n/messages_tw_CN.json @@ -160,12 +160,14 @@ "io.sc.engine.mv.result.curve.ks.y1" : "(Y1)正常樣本占比", "io.sc.engine.mv.result.curve.ks.y2" : "(Y2)違約樣本占比", + "io.sc.engine.mv.result.chiSquare.grid.title" : "卡方检验結果", "io.sc.engine.mv.result.chiSquare.level" : "評分等級", "io.sc.engine.mv.result.chiSquare.pd" : "違約概率", "io.sc.engine.mv.result.chiSquare.count" : "樣本總數", "io.sc.engine.mv.result.chiSquare.defaultCount" : "事實違約樣本個數", "io.sc.engine.mv.result.chiSquare.chiSquare" : "卡方检验值", + "io.sc.engine.mv.result.binomial.grid.title" : "二項檢驗結果", "io.sc.engine.mv.result.binomial.level" : "評分等級", "io.sc.engine.mv.result.binomial.pd" : "違約概率", "io.sc.engine.mv.result.binomial.count" : "樣本總數", diff --git a/io.sc.engine.mv.frontend/src/i18n/messages_zh_CN.json b/io.sc.engine.mv.frontend/src/i18n/messages_zh_CN.json index 9ffe3cff..dd1c7c53 100644 --- a/io.sc.engine.mv.frontend/src/i18n/messages_zh_CN.json +++ b/io.sc.engine.mv.frontend/src/i18n/messages_zh_CN.json @@ -167,12 +167,14 @@ "io.sc.engine.mv.result.curve.ks.y1" : "(Y1)正常样本占比", "io.sc.engine.mv.result.curve.ks.y2" : "(Y2)违约样本占比", + "io.sc.engine.mv.result.chiSquare.grid.title" : "卡方检验结果", "io.sc.engine.mv.result.chiSquare.level" : "评分等级", "io.sc.engine.mv.result.chiSquare.pd" : "违约概率", "io.sc.engine.mv.result.chiSquare.count" : "样本总数", "io.sc.engine.mv.result.chiSquare.defaultCount" : "事实违约样本个数", "io.sc.engine.mv.result.chiSquare.chiSquare" : "卡方检验值", + "io.sc.engine.mv.result.binomial.grid.title" : "二项检验结果", "io.sc.engine.mv.result.binomial.level" : "评分等级", "io.sc.engine.mv.result.binomial.pd" : "违约概率", "io.sc.engine.mv.result.binomial.count" : "样本总数", diff --git a/io.sc.engine.mv.frontend/src/views/result/ResultDetailDialog.vue b/io.sc.engine.mv.frontend/src/views/result/ResultDetailDialog.vue index c5fd0066..e4a8b26e 100644 --- a/io.sc.engine.mv.frontend/src/views/result/ResultDetailDialog.vue +++ b/io.sc.engine.mv.frontend/src/views/result/ResultDetailDialog.vue @@ -65,42 +65,44 @@
-
+
-
+
diff --git a/io.sc.engine.mv/src/main/java/io/sc/engine/mv/controller/coe/BinomialWebController.java b/io.sc.engine.mv/src/main/java/io/sc/engine/mv/controller/coe/BinomialWebController.java index 90cc83a9..e7a73492 100644 --- a/io.sc.engine.mv/src/main/java/io/sc/engine/mv/controller/coe/BinomialWebController.java +++ b/io.sc.engine.mv/src/main/java/io/sc/engine/mv/controller/coe/BinomialWebController.java @@ -7,26 +7,21 @@ import org.springframework.data.domain.Example; import org.springframework.data.domain.ExampleMatcher; import org.springframework.data.domain.ExampleMatcher.StringMatcher; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.List; -@Controller -@RequestMapping("/mv/coe/binomial") +@RestController +@RequestMapping("/api/mv/coe/binomial") public class BinomialWebController { @Autowired private CoeBinomialHistoryRepository coeBinomialHistoryRepository; - @RequestMapping(value="isc/fetch",method=RequestMethod.GET) - @ResponseBody + @GetMapping(value="") public List iscFetch(CoeBinomialHistory history){ return fetch(history); } - @RequestMapping(value="fetch",method=RequestMethod.GET) - @ResponseBody - public List fetch(CoeBinomialHistory history){ + private List fetch(CoeBinomialHistory history){ ExampleMatcher matcher = ExampleMatcher.matching() .withIgnoreNullValues() .withIgnoreCase() diff --git a/io.sc.engine.mv/src/main/java/io/sc/engine/mv/controller/coe/ChiSquareWebController.java b/io.sc.engine.mv/src/main/java/io/sc/engine/mv/controller/coe/ChiSquareWebController.java index 0b6344b8..58a71217 100644 --- a/io.sc.engine.mv/src/main/java/io/sc/engine/mv/controller/coe/ChiSquareWebController.java +++ b/io.sc.engine.mv/src/main/java/io/sc/engine/mv/controller/coe/ChiSquareWebController.java @@ -7,26 +7,21 @@ import org.springframework.data.domain.Example; import org.springframework.data.domain.ExampleMatcher; import org.springframework.data.domain.ExampleMatcher.StringMatcher; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.List; -@Controller -@RequestMapping("/mv/coe/chiSquare") +@RestController +@RequestMapping("/api/mv/coe/chiSquare") public class ChiSquareWebController { @Autowired private CoeChiSquareHistoryRepository coeChiSquareHistoryRepository; - @RequestMapping(value="isc/fetch",method=RequestMethod.GET) - @ResponseBody + @GetMapping("") public List iscFetch(CoeChiSquareHistory psiHistory){ return fetch(psiHistory); } - @RequestMapping(value="fetch",method=RequestMethod.GET) - @ResponseBody - public List fetch(CoeChiSquareHistory history){ + private List fetch(CoeChiSquareHistory history){ ExampleMatcher matcher = ExampleMatcher.matching() .withIgnoreNullValues() .withIgnoreCase() diff --git a/io.sc.platform.core/src/main/java/io/sc/platform/core/autoconfigure/RestarterInterceptorAutoConfiguration.java b/io.sc.platform.core/src/main/java/io/sc/platform/core/autoconfigure/RestarterInterceptorAutoConfiguration.java index ffa56859..0bf24b3b 100644 --- a/io.sc.platform.core/src/main/java/io/sc/platform/core/autoconfigure/RestarterInterceptorAutoConfiguration.java +++ b/io.sc.platform.core/src/main/java/io/sc/platform/core/autoconfigure/RestarterInterceptorAutoConfiguration.java @@ -37,7 +37,7 @@ import java.util.Set; public class RestarterInterceptorAutoConfiguration implements WebMvcConfigurer { private static final String[] excludePathPatterns =new String[] { "/" + Environment.getInstance().getApplicationName() + "/**", - "/io.sc.platform.coe/**", + "/io.sc.platform.core/**", "/error" }; @Autowired private ApplicationContext applicationContext; diff --git a/io.sc.platform.core/src/main/java/io/sc/platform/core/controller/RestarterWebController.java b/io.sc.platform.core/src/main/java/io/sc/platform/core/controller/RestarterWebController.java index 048a714f..b4ac6638 100644 --- a/io.sc.platform.core/src/main/java/io/sc/platform/core/controller/RestarterWebController.java +++ b/io.sc.platform.core/src/main/java/io/sc/platform/core/controller/RestarterWebController.java @@ -14,7 +14,7 @@ import org.springframework.web.servlet.ModelAndView; * 当系统检测到需要重启时, 所有的请求都将被重定向到本控制器 */ @Controller -@RequestMapping("/io.sc.platform.coe") +@RequestMapping("/io.sc.platform.core") public class RestarterWebController { @RequestMapping(value="restarter.html") public ModelAndView restarter(Model model){ diff --git a/io.sc.platform.core/src/main/java/io/sc/platform/core/interceptor/RestarterInterceptor.java b/io.sc.platform.core/src/main/java/io/sc/platform/core/interceptor/RestarterInterceptor.java index 836733a0..ac801894 100644 --- a/io.sc.platform.core/src/main/java/io/sc/platform/core/interceptor/RestarterInterceptor.java +++ b/io.sc.platform.core/src/main/java/io/sc/platform/core/interceptor/RestarterInterceptor.java @@ -15,7 +15,7 @@ public class RestarterInterceptor implements HandlerInterceptor{ @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { if(RuntimeStatus.RESTARTING.equals(Environment.getInstance().getRuntimeStatus())) { - RedirectView view = new RedirectView("/io.sc.platform.coe/restarter.html"); + RedirectView view = new RedirectView("/io.sc.platform.core/restarter.html"); view.setContextRelative(true); view.render(null, request, response); return false; diff --git a/io.sc.platform.core/src/main/java/io/sc/platform/core/springboot/BeforeEnvironmentProcessor.java b/io.sc.platform.core/src/main/java/io/sc/platform/core/springboot/BeforeEnvironmentProcessor.java index 27a94c43..c325a7d8 100644 --- a/io.sc.platform.core/src/main/java/io/sc/platform/core/springboot/BeforeEnvironmentProcessor.java +++ b/io.sc.platform.core/src/main/java/io/sc/platform/core/springboot/BeforeEnvironmentProcessor.java @@ -139,21 +139,21 @@ public class BeforeEnvironmentProcessor implements EnvironmentPostProcessor, Ord exportConfigurationFile(new String[]{ "classpath:/logback-spring.xml", "classpath:/config/logback-spring.xml", - "classpath:/io/sc/platform/coe/config/logback-spring.xml" + "classpath:/io/sc/platform/core/config/logback-spring.xml" },"/config/logback-spring.xml",environment); // banner.txt exportConfigurationFile(new String[]{ "classpath:/banner.txt", "classpath:/config/banner.txt", - "classpath:/io/sc/platform/coe/config/banner.txt" + "classpath:/io/sc/platform/core/config/banner.txt" },"/config/banner.txt",environment); // license.txt exportConfigurationFile(new String[]{ "classpath:/license.txt", "classpath:/config/license.txt", - "classpath:/io/sc/platform/coe/config/license.txt" + "classpath:/io/sc/platform/core/config/license.txt" },"/config/license.txt",environment); } diff --git a/io.sc.platform.core/src/main/java/io/sc/platform/core/util/EnumUtil.java b/io.sc.platform.core/src/main/java/io/sc/platform/core/util/EnumUtil.java index 19d018a7..7719e99d 100644 --- a/io.sc.platform.core/src/main/java/io/sc/platform/core/util/EnumUtil.java +++ b/io.sc.platform.core/src/main/java/io/sc/platform/core/util/EnumUtil.java @@ -16,7 +16,7 @@ public class EnumUtil { * 将枚举转换成 Map * 示例: * 1) 枚举定义 - * package io.sc.platform.coe.util; + * package io.sc.platform.core.util; * enum Color{ * RED,YELLOW,GREEN * } @@ -28,9 +28,9 @@ public class EnumUtil { * } * * 3) 结果 - * RED : io.sc.platform.coe.util.Color.RED - * YELLOW : io.sc.platform.coe.util.Color.YELLOW - * GREEN : io.sc.platform.coe.util.Color.GREEN + * RED : io.sc.platform.core.util.Color.RED + * YELLOW : io.sc.platform.core.util.Color.YELLOW + * GREEN : io.sc.platform.core.util.Color.GREEN * @param type 枚举类 * @return 枚举 Map, 其中 key:表示枚举名称, value: 表示枚举的全路径类名称 */ diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml b/io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml index 90e8947d..6d411899 100644 --- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml +++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml @@ -48,16 +48,16 @@