diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 718d9db..464d675 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -86,6 +86,16 @@ casic-metadata-core ${casic.version} + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + com.casic + casic-admin-export + ${casic.version} + com.casic diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 718d9db..464d675 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -86,6 +86,16 @@ casic-metadata-core ${casic.version} + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + com.casic + casic-admin-export + ${casic.version} + com.casic diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml index 45ca653..17b9bba 100644 --- a/casic-web/src/main/resources/application.yml +++ b/casic-web/src/main/resources/application.yml @@ -14,7 +14,6 @@ ################### guns配置 ################### casic: kaptcha-open: true #是否开启登录时验证码 (true/false) - file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) nologin-urls: /user/login,/kaptcha,/config/baseConfig mybatis-plus: global-config: @@ -22,4 +21,4 @@ server: tomcat: - max-http-post-size: -1 \ No newline at end of file + max-http-post-size: -1 diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 718d9db..464d675 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -86,6 +86,16 @@ casic-metadata-core ${casic.version} + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + com.casic + casic-admin-export + ${casic.version} + com.casic diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml index 45ca653..17b9bba 100644 --- a/casic-web/src/main/resources/application.yml +++ b/casic-web/src/main/resources/application.yml @@ -14,7 +14,6 @@ ################### guns配置 ################### casic: kaptcha-open: true #是否开启登录时验证码 (true/false) - file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) nologin-urls: /user/login,/kaptcha,/config/baseConfig mybatis-plus: global-config: @@ -22,4 +21,4 @@ server: tomcat: - max-http-post-size: -1 \ No newline at end of file + max-http-post-size: -1 diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 1616383..a13c1df 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,7 +4,6 @@ spring: datasource: url: jdbc:mysql://192.168.0.212:3306/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull -# url: jdbc:mysql://119.254.103.80:3000/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: root initial-size: 2 diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 718d9db..464d675 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -86,6 +86,16 @@ casic-metadata-core ${casic.version} + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + com.casic + casic-admin-export + ${casic.version} + com.casic diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml index 45ca653..17b9bba 100644 --- a/casic-web/src/main/resources/application.yml +++ b/casic-web/src/main/resources/application.yml @@ -14,7 +14,6 @@ ################### guns配置 ################### casic: kaptcha-open: true #是否开启登录时验证码 (true/false) - file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) nologin-urls: /user/login,/kaptcha,/config/baseConfig mybatis-plus: global-config: @@ -22,4 +21,4 @@ server: tomcat: - max-http-post-size: -1 \ No newline at end of file + max-http-post-size: -1 diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 1616383..a13c1df 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,7 +4,6 @@ spring: datasource: url: jdbc:mysql://192.168.0.212:3306/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull -# url: jdbc:mysql://119.254.103.80:3000/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: root initial-size: 2 diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml index 34d2de1..891147e 100644 --- a/casic-web/src/main/resources/config/application-test.yml +++ b/casic-web/src/main/resources/config/application-test.yml @@ -12,7 +12,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram - file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload + export-temp-path: E:\soft\othersoft\203\casic-iris-parent\casic-web\src\main\resources\config\temp\ mybatis-plus: global-config: sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 718d9db..464d675 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -86,6 +86,16 @@ casic-metadata-core ${casic.version} + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + com.casic + casic-admin-export + ${casic.version} + com.casic diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml index 45ca653..17b9bba 100644 --- a/casic-web/src/main/resources/application.yml +++ b/casic-web/src/main/resources/application.yml @@ -14,7 +14,6 @@ ################### guns配置 ################### casic: kaptcha-open: true #是否开启登录时验证码 (true/false) - file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) nologin-urls: /user/login,/kaptcha,/config/baseConfig mybatis-plus: global-config: @@ -22,4 +21,4 @@ server: tomcat: - max-http-post-size: -1 \ No newline at end of file + max-http-post-size: -1 diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 1616383..a13c1df 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,7 +4,6 @@ spring: datasource: url: jdbc:mysql://192.168.0.212:3306/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull -# url: jdbc:mysql://119.254.103.80:3000/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: root initial-size: 2 diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml index 34d2de1..891147e 100644 --- a/casic-web/src/main/resources/config/application-test.yml +++ b/casic-web/src/main/resources/config/application-test.yml @@ -12,7 +12,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram - file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload + export-temp-path: E:\soft\othersoft\203\casic-iris-parent\casic-web\src\main\resources\config\temp\ mybatis-plus: global-config: sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject diff --git a/casic-web/src/main/resources/config/temp/personTemp.xlsx b/casic-web/src/main/resources/config/temp/personTemp.xlsx new file mode 100644 index 0000000..d0273ba --- /dev/null +++ b/casic-web/src/main/resources/config/temp/personTemp.xlsx Binary files differ