diff --git "a/doc/\345\216\206\345\217\262/SQL\346\226\207\344\273\266\347\211\210\346\234\254\350\257\264\346\230\216.md" "b/doc/\345\216\206\345\217\262/SQL\346\226\207\344\273\266\347\211\210\346\234\254\350\257\264\346\230\216.md" deleted file mode 100644 index 4546f298..00000000 --- "a/doc/\345\216\206\345\217\262/SQL\346\226\207\344\273\266\347\211\210\346\234\254\350\257\264\346\230\216.md" +++ /dev/null @@ -1,16 +0,0 @@ -# 温馨提示,请使用master分支 -db-mcms-mysql-4.7.0 最低版本mysql 5.7 -db-mcms-sqlserver-4.7.0 最低版本 SQLServer2012 - -如果使用低与要求版本数据库会出现如下错误 -1、导入 mysql文件 datetime时间函数报错,请使用4.6.5版本以下的SQL文件(不包含4.6.5) -2、SQLServer数据库版本 自定义标签 使用了SQLServer2012最新的分页函数 , - 请自行修改mdiy_tag_sql表中的分页函数 - -数据库类型切换 :修改application.yml中 - database-id: mysql、sqlServer、oracle -数据库连接切换:修改 -spring: - http.multipart.enabled: false - profiles: - active: dev、prod、test \ No newline at end of file diff --git "a/doc/\345\216\206\345\217\262/\346\226\207\347\253\240\347\261\273\345\233\276-0.0.1.asta" "b/doc/\345\216\206\345\217\262/\346\226\207\347\253\240\347\261\273\345\233\276-0.0.1.asta" deleted file mode 100644 index 003031d4..00000000 Binary files "a/doc/\345\216\206\345\217\262/\346\226\207\347\253\240\347\261\273\345\233\276-0.0.1.asta" and /dev/null differ diff --git "a/doc/\345\216\206\345\217\262/\346\226\207\347\253\240\347\261\273\345\233\276-0.0.2.asta" "b/doc/\345\216\206\345\217\262/\346\226\207\347\253\240\347\261\273\345\233\276-0.0.2.asta" deleted file mode 100644 index d469ffc8..00000000 Binary files "a/doc/\345\216\206\345\217\262/\346\226\207\347\253\240\347\261\273\345\233\276-0.0.2.asta" and /dev/null differ diff --git "a/doc/\345\216\206\345\217\262/\346\226\207\347\253\240\347\261\273\345\233\276-0.0.3.asta" "b/doc/\345\216\206\345\217\262/\346\226\207\347\253\240\347\261\273\345\233\276-0.0.3.asta" deleted file mode 100644 index 0ba6b84d..00000000 Binary files "a/doc/\345\216\206\345\217\262/\346\226\207\347\253\240\347\261\273\345\233\276-0.0.3.asta" and /dev/null differ diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index 7b0d3672..00000000 Binary files a/src/.DS_Store and /dev/null differ diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 61de3019..6307caca 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ spring: datasource: - url: jdbc:mysql://imingsoft.cn:3307/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true + url: jdbc:mysql://localhost:3306/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true username: root - password: root@78 + password: root filters: wall,mergeStat type: com.alibaba.druid.pool.DruidDataSource \ No newline at end of file diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt new file mode 100644 index 00000000..affc6556 --- /dev/null +++ b/src/main/resources/banner.txt @@ -0,0 +1,8 @@ + . ____ _ __ _ _ + /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \ +( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \ + \\/ ___)| |_)| | | | | || (_| | ) ) ) ) + ' |____| .__|_| |_|_| |_\__, | / / / / + =========|_|==============|___/=/_/_/_/ + :: Spring Boot :: (v2.0.8.RELEASE) + :: MS MCms 系统 :: (v4.7.1) \ No newline at end of file