From 141a027dd41bc0a76d6c3e1cf78ce51ee9cfe82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E5=BA=B7?= Date: Wed, 26 Dec 2018 10:08:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0a5e557..a79054d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ *.zip *.tar.gz *.rar +*.impl # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* From edcd2867e1efbff9a6c3e104e24de98a0d9ab4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E5=BA=B7?= Date: Wed, 26 Dec 2018 13:02:19 +0800 Subject: [PATCH 2/3] config-repo init.. --- tamguo-config-repo/tamguo/README | 0 .../tamguo/tamguo-pre.properties | 63 +++++++++++++++++++ .../tamguo/tamguo-test.properties | 63 +++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 tamguo-config-repo/tamguo/README create mode 100644 tamguo-config-repo/tamguo/tamguo-pre.properties create mode 100644 tamguo-config-repo/tamguo/tamguo-test.properties diff --git a/tamguo-config-repo/tamguo/README b/tamguo-config-repo/tamguo/README new file mode 100644 index 0000000..e69de29 diff --git a/tamguo-config-repo/tamguo/tamguo-pre.properties b/tamguo-config-repo/tamguo/tamguo-pre.properties new file mode 100644 index 0000000..28c8229 --- /dev/null +++ b/tamguo-config-repo/tamguo/tamguo-pre.properties @@ -0,0 +1,63 @@ +sitename=tamguo +domain.name=http://localhost:8081/ +admin.domain.name=http://admin.tanguoguo.com +server.port=8081 +jasypt.encryptor.password=tamguo + +spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.filters=stat,wall,log4j +spring.datasource.initialSize=5 +spring.datasource.maxActive=20 +spring.datasource.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.maxWait=60000 +spring.datasource.minEvictableIdleTimeMillis=300000 +spring.datasource.minIdle=5 +spring.datasource.password=Tanguo +spring.datasource.poolPreparedStatements=true +spring.datasource.testOnBorrow=false +spring.datasource.testOnReturn=false +spring.datasource.testWhileIdle=true +spring.datasource.timeBetweenEvictionRunsMillis=60000 +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tamguo?useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=root +spring.datasource.validationQuery=SELECT 1 FROM DUAL + +mybatis-plus.mapper-locations=classpath:/mappers/*Mapper.xml +mybatis-plus.typeAliasesPackage=com.tamguo.model +mybatis-plus.typeEnumsPackage=com.tamguo.model.enums +mybatis-plus.global-config.id-type=5 +mybatis-plus.global-config.field-strategy=2 +mybatis-plus.global-config.db-column-underline=true +mybatis-plus.global-config.refresh-mapper=true +mybatis-plus.global-config.key-generator=com.baomidou.mybatisplus.incrementer.H2KeyGenerator +mybatis-plus.global-config.logic-delete-value=0 +mybatis-plus.global-config.logic-not-delete-value=1 +mybatis-plus.global-config.sql-injector=com.baomidou.mybatisplus.mapper.LogicSqlInjector +mybatis-plus.global-config.meta-object-handler=com.tamguo.config.dao.MyMetaObjectHandler +mybatis-plus.global-config.sql-parser-cache=true +mybatis-plus.configuration.map-underscore-to-camel-case=true +mybatis-plus.configuration.cache-enabled=false + +spring.thymeleaf.prefix=classpath:/templates/ +spring.thymeleaf.suffix=.html +spring.thymeleaf.mode=LEGACYHTML5 +spring.thymeleaf.encoding=UTF-8 +spring.thymeleaf.content-type=text/html +spring.thymeleaf.cache=false + +redis.hostname=127.0.0.1 +redis.port=6379 +redis.password= + +logging.level.root=INFO +logging.level.org.springframework.web=INFO +logging.file=/home/webdata/log/tamguo.log +logging.pattern.console=%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n +logging.pattern.file=%d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n + +server.compression.enabled=true +server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain + +file.storage.path=/home/webdata/files/ \ No newline at end of file diff --git a/tamguo-config-repo/tamguo/tamguo-test.properties b/tamguo-config-repo/tamguo/tamguo-test.properties new file mode 100644 index 0000000..28c8229 --- /dev/null +++ b/tamguo-config-repo/tamguo/tamguo-test.properties @@ -0,0 +1,63 @@ +sitename=tamguo +domain.name=http://localhost:8081/ +admin.domain.name=http://admin.tanguoguo.com +server.port=8081 +jasypt.encryptor.password=tamguo + +spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.filters=stat,wall,log4j +spring.datasource.initialSize=5 +spring.datasource.maxActive=20 +spring.datasource.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.maxWait=60000 +spring.datasource.minEvictableIdleTimeMillis=300000 +spring.datasource.minIdle=5 +spring.datasource.password=Tanguo +spring.datasource.poolPreparedStatements=true +spring.datasource.testOnBorrow=false +spring.datasource.testOnReturn=false +spring.datasource.testWhileIdle=true +spring.datasource.timeBetweenEvictionRunsMillis=60000 +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tamguo?useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=root +spring.datasource.validationQuery=SELECT 1 FROM DUAL + +mybatis-plus.mapper-locations=classpath:/mappers/*Mapper.xml +mybatis-plus.typeAliasesPackage=com.tamguo.model +mybatis-plus.typeEnumsPackage=com.tamguo.model.enums +mybatis-plus.global-config.id-type=5 +mybatis-plus.global-config.field-strategy=2 +mybatis-plus.global-config.db-column-underline=true +mybatis-plus.global-config.refresh-mapper=true +mybatis-plus.global-config.key-generator=com.baomidou.mybatisplus.incrementer.H2KeyGenerator +mybatis-plus.global-config.logic-delete-value=0 +mybatis-plus.global-config.logic-not-delete-value=1 +mybatis-plus.global-config.sql-injector=com.baomidou.mybatisplus.mapper.LogicSqlInjector +mybatis-plus.global-config.meta-object-handler=com.tamguo.config.dao.MyMetaObjectHandler +mybatis-plus.global-config.sql-parser-cache=true +mybatis-plus.configuration.map-underscore-to-camel-case=true +mybatis-plus.configuration.cache-enabled=false + +spring.thymeleaf.prefix=classpath:/templates/ +spring.thymeleaf.suffix=.html +spring.thymeleaf.mode=LEGACYHTML5 +spring.thymeleaf.encoding=UTF-8 +spring.thymeleaf.content-type=text/html +spring.thymeleaf.cache=false + +redis.hostname=127.0.0.1 +redis.port=6379 +redis.password= + +logging.level.root=INFO +logging.level.org.springframework.web=INFO +logging.file=/home/webdata/log/tamguo.log +logging.pattern.console=%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n +logging.pattern.file=%d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n + +server.compression.enabled=true +server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain + +file.storage.path=/home/webdata/files/ \ No newline at end of file From 7072f5df936df2ebbabd23370bbc913ea9601e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E5=BA=B7?= <434329122@qq.com> Date: Wed, 26 Dec 2018 14:33:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20tamguo-test.properties?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tamguo-config-repo/tamguo/tamguo-test.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tamguo-config-repo/tamguo/tamguo-test.properties b/tamguo-config-repo/tamguo/tamguo-test.properties index 28c8229..ab00b4f 100644 --- a/tamguo-config-repo/tamguo/tamguo-test.properties +++ b/tamguo-config-repo/tamguo/tamguo-test.properties @@ -13,7 +13,7 @@ spring.datasource.maxPoolPreparedStatementPerConnectionSize=20 spring.datasource.maxWait=60000 spring.datasource.minEvictableIdleTimeMillis=300000 spring.datasource.minIdle=5 -spring.datasource.password=Tanguo +spring.datasource.password=admin spring.datasource.poolPreparedStatements=true spring.datasource.testOnBorrow=false spring.datasource.testOnReturn=false