diff --git a/.gitignore b/.gitignore index 518e5022f5f842bb6eeb35dc6e9043ac5d2ac542..8ce455a205841818b691c445a2ab10cd828740a3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ 。DS_Store */target/* */.settings/* +*/logs/* diff --git a/antdsp-admin/.gitignore b/antdsp-admin/.gitignore index b83d22266ac8aa2f8df2edef68082c789727841d..58da1f721d8718ca3c9cdb0cd15ad35a0185d53c 100644 --- a/antdsp-admin/.gitignore +++ b/antdsp-admin/.gitignore @@ -1 +1,2 @@ /target/ +/logs/ diff --git a/antdsp-admin/pom.xml b/antdsp-admin/pom.xml index ed1d23d9e8db1218aa6e5cce7a8a4be8c87036a9..78bdd96a5b89f923ea49a1a3fd7e5a521abe5892 100644 --- a/antdsp-admin/pom.xml +++ b/antdsp-admin/pom.xml @@ -72,4 +72,30 @@ + + + dev + + true + + + jdbc:mysql://192.168.1.231:3306/antdsp?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + root + 123456 + com.mysql.cj.jdbc.Driver + com.alibaba.druid.pool.DruidDataSource + + logs + + TnmENtV4x4oG0qfnXY3gSAmLplBw9bvRJ3IKS0X1 + nMKAApnVrmBDifwuT5Pq5V33XhNOgcT4njErx5fV + antdsp + + + + src/main/resources/application.yml + + + + \ No newline at end of file diff --git a/antdsp-admin/src/main/resources/application-dev.yml b/antdsp-admin/src/main/resources/application-dev.yml deleted file mode 100644 index cb6fc7fa9a945fcc01a59d054eb83f07740cf308..0000000000000000000000000000000000000000 --- a/antdsp-admin/src/main/resources/application-dev.yml +++ /dev/null @@ -1,19 +0,0 @@ -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.1.231:3306/antdsp?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - username: root - password: 123456 - initial-size: 10 - jpa: - hibernate: - ddl-auto: update - show-sql: true - database-platform: org.hibernate.dialect.MySQL5InnoDBDialect - -qiniu: - accessKey: xxx - secretKey: xxx - bucket: antdsp - \ No newline at end of file diff --git a/antdsp-admin/src/main/resources/application.yml b/antdsp-admin/src/main/resources/application.yml index fcfadf9824cf0c7087e118015340b005e752cd41..865e46479018a5c18d79f66bbe5bf714b64cd998 100644 --- a/antdsp-admin/src/main/resources/application.yml +++ b/antdsp-admin/src/main/resources/application.yml @@ -2,6 +2,8 @@ antdsp: name: antdsp version: 0.0.1 copyrightYear: 2019 + logback: + filepath: @antdsp.logback.filepath@ server: servlet: context-path: /antdsp-api @@ -9,9 +11,25 @@ server: timeout: 30 port: 8088 spring: - profiles: - active: dev + datasource: + type: @antdsp.db.datasource@ + driver-class-name: @antdsp.db.driver@ + url: @antdsp.db.url@ + username: @antdsp.db.username@ + password: @antdsp.db.password@ + initial-size: 10 + jpa: + hibernate: + ddl-auto: update + show-sql: true + database-platform: org.hibernate.dialect.MySQL5InnoDBDialect application: name: antdsp aop: auto: true #启动Spring AOP 配置 + +qiniu: + accessKey: @qiniu.accessKey@ + secretKey: @qiniu.secretKey@ + bucket: @qiniu.bucket@ + diff --git a/antdsp-admin/src/main/resources/logback-spring.xml b/antdsp-admin/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000000000000000000000000000000000..c0a5b04e0ff371d84c74afc47af77969c9e68daa --- /dev/null +++ b/antdsp-admin/src/main/resources/logback-spring.xml @@ -0,0 +1,37 @@ + + + + + + + + + ${LOG_PATTERN} + UTF-8 + + + + + + ${FILE_PATH}/antdsp.log + + ${LOG_PATTERN} + UTF-8 + + + + ${FILE_PATH}/antdsp-%d{yyyy-MM-dd}.%i.log + + 30 + + 10MB + + + + + + + + + + \ No newline at end of file diff --git a/antdsp-admin/src/main/web/src/custom/UnipicUpload.js b/antdsp-admin/src/main/web/src/custom/UnipicUpload.js index d248ec6a1727b07858eb0c96e0ef684b83373f17..797e436361572e13eba5334ef1d17a962b664537 100644 --- a/antdsp-admin/src/main/web/src/custom/UnipicUpload.js +++ b/antdsp-admin/src/main/web/src/custom/UnipicUpload.js @@ -10,9 +10,9 @@ export default class UnipicUpload extends PureComponent{ } componentWillReceiveProps(newProps){ - const { image } = this.props; + const { value } = newProps; this.setState({ - imgUrl: image + imgUrl: value }) } @@ -41,10 +41,8 @@ export default class UnipicUpload extends PureComponent{ if (info.file.status === 'done') { const response = info.file.response; + this.setState({loading: false}); if(response.success){ - this.setState({ - imgUrl: response.message - }); onChange(response.message); } } @@ -65,7 +63,7 @@ export default class UnipicUpload extends PureComponent{ onChange={this.handlerUploadOnChange} > { - imgUrl ? + !this.state.loading && imgUrl ? :