diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultDatabaseInfoImpl.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultDatabaseInfoImpl.java index 8e98425..d4b35e7 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultDatabaseInfoImpl.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultDatabaseInfoImpl.java @@ -5,7 +5,6 @@ import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.framework.core.db.cache.ModelDatabaseCache; import cc.smtweb.framework.core.db.vo.ModelDatabase; import cc.smtweb.framework.core.util.SpringUtil; -import com.sun.org.apache.xpath.internal.operations.Mod; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.support.JdbcUtils; diff --git a/smtweb-framework/core/src/main/resources/config/application-dev.yaml b/smtweb-framework/core/src/main/resources/config/application-dev.yaml deleted file mode 100644 index bf8c0cf..0000000 --- a/smtweb-framework/core/src/main/resources/config/application-dev.yaml +++ /dev/null @@ -1,61 +0,0 @@ -smtweb: - machine-id: 1 - file: - local-path: /data/files/smart/ - host: http://127.0.0.1 - url: ${smtweb.file.host}:${server.port}${server.servlet.context-path}/${smtweb.file.local-path} - db: - type: mysql - default: - rule: - prefix: _smt_ - replace: smt_ -server: - port: 8888 - servlet: - context-path: / -logging: - level: - root: INFO - cc.smtweb: DEBUG -spring: - # 设置服务名 - application: - name: smtweb_core - main: - allow-bean-definition-overriding: true - mvc: - static-path-pattern: /static/** - redis: - name: ${smtweb.machine-id} - host: 127.0.0.1 - port: 6379 - password: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/smt_asp?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false - username: root - password: root - servlet: - multipart: - max-file-size: 104857600000 - max-request-size: 10485760000000 -# profiles: -# include: role - cache: - type: caffeine - cache-names: - - core - caffeine: - spec: maximumSize=1024,expireAfterWrite=2h -park: - secret: - key: null -# key: cmVmb3JtZXJyZWZvcm1lcg== -swagger: - name: smtweb-core - version: 2.0 - enabled: true - - - diff --git a/smtweb-framework/core/src/main/resources/config/application-prod.yaml b/smtweb-framework/core/src/main/resources/config/application-prod.yaml deleted file mode 100644 index eaed90b..0000000 --- a/smtweb-framework/core/src/main/resources/config/application-prod.yaml +++ /dev/null @@ -1,52 +0,0 @@ -sme: - machine-id: 1 - file-local-path: /data/files/smart/ - file-host: http://member.sumi168.cn - file-url: ${sme.file-host}:${server.port}${server.servlet.context-path}/${sme.file-local-path} - -server: - port: 10001 - servlet: - context-path: /user - -feign: - hystrix: - enabled: false -logging: - level: - smtweb: DEBUG - -spring: - # 设置服务名 - application: - name: smtweb-user - main: - allow-bean-definition-overriding: true - mvc: - static-path-pattern: /static/** - redis: - host: 127.0.0.1 - port: 6379 - datasource: - user: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/smt_user?useUnicode=true&characterEncoding=utf-8&useTimezone=true&serverTimezone=CTT&allowMultiQueries=true - username: smt - password: smt_123456 - - servlet: - multipart: - max-file-size: 104857600000 - max-request-size: 10485760000000 - -swagger: - name: smart - version: 1.0.1 - enabled: false - -weixin: - url: http://devpk.smart.smefdd.com - appId: wx8d11474c01b92378 - appSecret: e1fa7bcdf27b46e7d69edad68ea8724b - - diff --git a/smtweb-framework/core/src/main/resources/config/application.yaml b/smtweb-framework/core/src/main/resources/config/application.yaml deleted file mode 100644 index caf4dfc..0000000 --- a/smtweb-framework/core/src/main/resources/config/application.yaml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev \ No newline at end of file