diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml deleted file mode 100644 index f6992f7..0000000 --- a/casic-web/src/main/resources/application.yml +++ /dev/null @@ -1,22 +0,0 @@ -########################################################## -################## 所有profile共有的配置 ################# -########################################################## -spring: - profiles: - active: @activatedProperties@ - datasource: - driver-class-name: com.mysql.jdbc.Driver - jms: - pub-sub-domain: true - aop: - proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理 -################### mybatis-plus配置 ################### -################### guns配置 ################### -casic: - kaptcha-open: true #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/kaptcha,/config/baseConfig - config: - export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ - config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ - office: - maxRowsExcel: 65536 \ No newline at end of file diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml deleted file mode 100644 index f6992f7..0000000 --- a/casic-web/src/main/resources/application.yml +++ /dev/null @@ -1,22 +0,0 @@ -########################################################## -################## 所有profile共有的配置 ################# -########################################################## -spring: - profiles: - active: @activatedProperties@ - datasource: - driver-class-name: com.mysql.jdbc.Driver - jms: - pub-sub-domain: true - aop: - proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理 -################### mybatis-plus配置 ################### -################### guns配置 ################### -casic: - kaptcha-open: true #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/kaptcha,/config/baseConfig - config: - export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ - config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ - office: - maxRowsExcel: 65536 \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 45312cd..17b2db4 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -3,9 +3,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://139.198.16.38:8098/casic_smartcity_dcms?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_smartcity_dcms_cr?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: Casic203 + password: Casic203! initial-size: 2 min-idle: 1 jms: @@ -23,9 +23,9 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/departmentAssess/sourceList,/departmentAssess/highEventList,/case/addWeChat,/case/historyByPhoneListPage,/dict/code/caseSource,/fileUpload flowable: datasource: - url: jdbc:mysql://139.198.16.38:8098/dcms_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/dcms_flowable_cr?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: Casic203 + password: Casic203! logging: level.root: info level.com.casic: debug diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml deleted file mode 100644 index f6992f7..0000000 --- a/casic-web/src/main/resources/application.yml +++ /dev/null @@ -1,22 +0,0 @@ -########################################################## -################## 所有profile共有的配置 ################# -########################################################## -spring: - profiles: - active: @activatedProperties@ - datasource: - driver-class-name: com.mysql.jdbc.Driver - jms: - pub-sub-domain: true - aop: - proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理 -################### mybatis-plus配置 ################### -################### guns配置 ################### -casic: - kaptcha-open: true #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/kaptcha,/config/baseConfig - config: - export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ - config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ - office: - maxRowsExcel: 65536 \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 45312cd..17b2db4 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -3,9 +3,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://139.198.16.38:8098/casic_smartcity_dcms?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_smartcity_dcms_cr?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: Casic203 + password: Casic203! initial-size: 2 min-idle: 1 jms: @@ -23,9 +23,9 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/departmentAssess/sourceList,/departmentAssess/highEventList,/case/addWeChat,/case/historyByPhoneListPage,/dict/code/caseSource,/fileUpload flowable: datasource: - url: jdbc:mysql://139.198.16.38:8098/dcms_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/dcms_flowable_cr?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: Casic203 + password: Casic203! logging: level.root: info level.com.casic: debug diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml new file mode 100644 index 0000000..0753b5b --- /dev/null +++ b/casic-web/src/main/resources/config/application.yml @@ -0,0 +1,27 @@ +########################################################## +################## 所有profile共有的配置 ################# +########################################################## +spring: + profiles: + active: @activatedProperties@ + datasource: + driver-class-name: com.mysql.jdbc.Driver + jms: + pub-sub-domain: true + aop: + proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理 +################### mybatis-plus配置 ################### +################### guns配置 ################### +casic: + swagger-open: false #是否开启swagger (true/false) + kaptcha-open: false #是否开启登录时验证码 (true/false) + muti-datasource-open: false #是否开启多数据源(true/false) + spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false) + session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒 + session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒 + nologin-urls: /user/login,/kaptcha,/config/baseConfig + config: + export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ + config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ + office: + maxRowsExcel: 65536 \ No newline at end of file