diff --git a/pom.xml b/pom.xml index a25ab3d..fb09aee 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ org.springframework spring-context - 6.1.14 + 5.3.30 cn.hutool diff --git a/src/main/java/cn/com/connor/bh/bhdemo/demos/web/Constants/Constants.java b/src/main/java/cn/com/connor/bh/bhdemo/demos/web/Constants/Constants.java new file mode 100644 index 0000000..aa0b839 --- /dev/null +++ b/src/main/java/cn/com/connor/bh/bhdemo/demos/web/Constants/Constants.java @@ -0,0 +1,18 @@ +package cn.com.connor.bh.bhdemo.demos.web.Constants; + +public final class Constants { + /** + * 成功 + */ + public static final int SUCCESS = 1; + + /** + * 失败 + */ + public static final int FAIL = 0; + + /** + * 异常 + */ + public static final int EXCEPTION = -1; +} diff --git a/src/main/java/cn/com/connor/bh/bhdemo/demos/web/controller/DrawingController.java b/src/main/java/cn/com/connor/bh/bhdemo/demos/web/controller/DrawingController.java index f3eb642..8a30d8c 100644 --- a/src/main/java/cn/com/connor/bh/bhdemo/demos/web/controller/DrawingController.java +++ b/src/main/java/cn/com/connor/bh/bhdemo/demos/web/controller/DrawingController.java @@ -1,5 +1,6 @@ package cn.com.connor.bh.bhdemo.demos.web.controller; +import cn.com.connor.bh.bhdemo.demos.web.Constants.Constants; import cn.com.connor.bh.bhdemo.demos.web.mapper.TaskMapper; import cn.com.connor.bh.bhdemo.demos.web.service.CallExeService; import cn.com.connor.bh.bhdemo.demos.web.service.MqQueueService; @@ -70,7 +71,7 @@ public class DrawingController { }catch (Exception e){ e.printStackTrace(); System.out.println("》》》》》》》》》》转发异常《《《《《《《《《《"); - return 0; + return Constants.FAIL; } System.out.println("insertTask方法执行完毕!"); return result; diff --git a/src/main/resources/application_test.yml b/src/main/resources/application-dev.yml similarity index 73% rename from src/main/resources/application_test.yml rename to src/main/resources/application-dev.yml index 4fcf011..eaf00ce 100644 --- a/src/main/resources/application_test.yml +++ b/src/main/resources/application-dev.yml @@ -1,6 +1,6 @@ -server: - port: 8080 +#正式环境配置 spring: + profiles: dev datasource: driverClassName: oracle.jdbc.driver.OracleDriver url: jdbc:oracle:thin:@10.41.213.19:1521/orcl @@ -15,11 +15,8 @@ spring: template: default-receive-queue: StoCAPP -# url: jdbc:oracle:thin:@192.168.3.125:1521/TC12 -# username: infodba -# password: infodba mybatis: mapper-locations: classpath:mapper/*.xml type-aliases-package: cn.com.connor.bh.bhdemo.demos.web.entity configuration: - map-underscore-to-camel-case: true + map-underscore-to-camel-case: true \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml new file mode 100644 index 0000000..826d21e --- /dev/null +++ b/src/main/resources/application-test.yml @@ -0,0 +1,22 @@ +#本地测试环境配置 +spring: + profiles: test + datasource: + driverClassName: oracle.jdbc.driver.OracleDriver + url: jdbc:oracle:thin:@192.168.3.125:1521/TC12 + username: infodba + password: infodba + rabbitmq: + host: 192.168.3.125 + port: 5672 + username: kuma + password: 123 + + template: + default-receive-queue: StoCAPP + +mybatis: + mapper-locations: classpath:mapper/*.xml + type-aliases-package: cn.com.connor.bh.bhdemo.demos.web.entity + configuration: + map-underscore-to-camel-case: true diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 69a8d73..02ff619 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,26 +1,35 @@ -server: - port: 8080 -spring: - datasource: - driverClassName: oracle.jdbc.driver.OracleDriver - url: jdbc:oracle:thin:@10.41.213.19:1521/orcl - username: system - password: Aa12345678 - rabbitmq: - host: 192.168.3.125 - port: 5672 -# virtual-host: / - username: kuma - password: 123 +##正式环境配置 +#server: +# port: 8080 +#spring: +# datasource: +# driverClassName: oracle.jdbc.driver.OracleDriver +# url: jdbc:oracle:thin:@10.41.213.19:1521/orcl +# username: system +# password: Aa12345678 +# rabbitmq: +# host: 192.168.3.125 +# port: 5672 +## virtual-host: / +# username: kuma +# password: 123 +# +# template: +# default-receive-queue: StoCAPP +# +## url: jdbc:oracle:thin:@192.168.3.125:1521/TC12 +## username: infodba +## password: infodba +#mybatis: +# mapper-locations: classpath:mapper/*.xml +# type-aliases-package: cn.com.connor.bh.bhdemo.demos.web.entity +# configuration: +# map-underscore-to-camel-case: true + - template: - default-receive-queue: StoCAPP -# url: jdbc:oracle:thin:@192.168.3.125:1521/TC12 -# username: infodba -# password: infodba -mybatis: - mapper-locations: classpath:mapper/*.xml - type-aliases-package: cn.com.connor.bh.bhdemo.demos.web.entity - configuration: - map-underscore-to-camel-case: true +spring: + profiles: + active: test #需要使用的配置文件的后缀 +server: + port: 8080 \ No newline at end of file