From 0740114b6804a2bd051ae661bf5f321f9b7c4bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 25 Aug 2023 17:02:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A72.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mdp-form-bootstrap/README.md | 185 ------------ .../resources/application-123prod.properties | 82 ------ .../main/resources/application-dev.properties | 144 --------- .../resources/application-m1prod.properties | 153 ---------- .../resources/application-prod.properties | 79 ----- .../src/main/resources/application-prod.yml | 278 ++++++++++++++++++ .../src/main/resources/application.properties | 28 -- .../src/main/resources/application.yml | 5 + .../src/main/resources/logback-spring.xml | 19 +- .../main/resources/application-dev.properties | 116 -------- .../src/main/resources/application-dev.yml | 278 ++++++++++++++++++ .../resources/application-prod.properties | 30 -- .../src/main/resources/application.properties | 19 -- mdp-form/src/main/resources/application.yml | 5 + .../src/main/resources/logback-spring.xml | 19 +- 15 files changed, 582 insertions(+), 858 deletions(-) delete mode 100644 mdp-form-bootstrap/src/main/resources/application-123prod.properties delete mode 100644 mdp-form-bootstrap/src/main/resources/application-dev.properties delete mode 100644 mdp-form-bootstrap/src/main/resources/application-m1prod.properties delete mode 100644 mdp-form-bootstrap/src/main/resources/application-prod.properties create mode 100644 mdp-form-bootstrap/src/main/resources/application-prod.yml delete mode 100644 mdp-form-bootstrap/src/main/resources/application.properties create mode 100644 mdp-form-bootstrap/src/main/resources/application.yml delete mode 100644 mdp-form/src/main/resources/application-dev.properties create mode 100644 mdp-form/src/main/resources/application-dev.yml delete mode 100644 mdp-form/src/main/resources/application-prod.properties delete mode 100644 mdp-form/src/main/resources/application.properties create mode 100644 mdp-form/src/main/resources/application.yml diff --git a/mdp-form-bootstrap/README.md b/mdp-form-bootstrap/README.md index 65501dd..e69de29 100644 --- a/mdp-form-bootstrap/README.md +++ b/mdp-form-bootstrap/README.md @@ -1,185 +0,0 @@ -# To start - -这是一个开发工具项目，主要帮助程序员自动生成增删改查代码，由广州擎勤网络科技有限公司研发。 - - - -` 前端` - -# 前端开发工具 - node.js、webpacck、npm、eclipse、svn、安卓、ios等 - -# 前端ui-pc端 -vue.js、element-ui、axios - -# 前端ui-手机端 -vue.js、vux、weui、weex - -# 前端ui-微信公众号端 -vue.js、vux - -# 前端ui-微信小程序 -微信开发工具 - - -# 前端文件结构 -* build - webpack config files -* config - webpack config files -* dist - build -* src -your app - * api - * assets - * common - * components - your vue components - * mock - * styles - * views - your pages - * vuex - * App.vue - * main.js - main file - * routes.js -* static - static assets - -# 前端web开发工具安装步骤 首次安装执行 1-6，添加工程执行 7-12 -## 1 安装node.js 从网络下载最新稳定版本 -node-v8.9.1-x64 - -## 2 安装 npm -npm install npm@latest -g - -## 3 设置淘宝镜像及安装淘宝镜像命令cnpm （如有必要） -npm config set registry https://registry.npm.taobao.org - -npm install -g cnpm --registry=https://registry.npm.taobao.org - -## 4 通过镜像下载 node-sass（如有必要） -npm install -g node-sass --registry=https://registry.npm.taobao.org - -## 5 安装vue 命令行工具 （如有必要） -npm install -g vue-cli - -## 6 设置eclipse 关联 .vue文件 -Window -> Preferences -> General -> Editors -> File Associations -> Add -> *.vue -> Add -> HTML Editor / JS Editor / CSS Editor - -## 7 用eclipse 从svn下载工程项目 -svn地址 http://203.195.131.73:8085/svn/ -如工程 mdp-arc-web - -## 8 进入工程 目录 （假设工程在 D:\workspace\mdp-arc-web） -cd /D D:\workspace\mdp-arc-web - -## 9 安装工程依赖包 - D:\workspace\mdp-arc-web > npm install - -## 10 开发调试工程 -npm dev - -## 11 编译 -npm build - -## 12 拷贝编译后文件到后台工程（用于与后台工程一起打成jar包发布）（如有必要） -npm copyToStatic - - - -`服务端` -# 服务端开发工具 -jdk8、eclipse oxygen、svn、maven、oracle - -# 服务端编程框架 -spring boot 1.5、spring mvc 4、spring cloud 1.5、spring security 4、logback 1、mybatis 3、thymeleaf 3 - -# 服务端安装开发工具步骤 首次安装执行 1-3,开发打包部署执行4-5 -## 1 安装开发工具 -### 1.0 安装jdk8, elcipse oxygen, svn 官网下载64位版本 -jdk-8u121-windows-x64 -eclipse-jee-oxygen-3-win32-x86_64 -TortoiseSVN-1.9.7.27907-x64 - -### 1.1 配置eclipse运行内存 -在eclipse.ini中添加下面几个参数 --Xms512m --Xmx1024m - -### 1.2 从eclipse marketplace 下载版本控制插件工具svn -eclipse -> help -> Eclipse marketplace,搜索svn，安装subclipse4.2.3 - -#### 1.2.1 设置eclipse svn 忽略的文件规则 */logs/* */target/* */node_modules/* -Window -> Preferences -> Team -> Ignored Resource -> Add pattern -> */logs/* -Window -> Preferences -> Team -> Ignored Resource -> Add pattern -> */target/* -Window -> Preferences -> Team -> Ignored Resource -> Add pattern -> */node_modules/* - -### 1.3 设置eclipse工程编码为utf-8 -Window -> Preferences -> General -> Content Types -> java Archive / java class path / Text -> utf-8 -Window -> Preferences -> General -> Workspace -> Text file encoding / UTF-8 - -### 1.4 设置eclipse jdk -Window -> Preferences -> Java -> Installed JREs -> 选择一条 -> Edit -> C:\Program Files\Java\jdk1.8.0_121(假设jdk安装目录，注意不是jre目录) - -### 1.5 设置eclipse 检查项，提升编译速度 -Window -> Preferences -> Validation -> 找到build列 -> 只保留 Classpath Dependance Validator 选中状态 - -## 2 下载代码生成器mdp-dev -### 2.0 从svn下载mdp-dev工程，mdp自研发的开发工具 -svn 地址为 http://203.195.131.73:8085/svn/mdp/trunk/mdp-dev - -### 2.1 使用mdp-dev生成crud代码（开发业务功能时使用，先设计表结构，再生成代码） -使用/mdp-dev/src/test/java/com/qqkj/mdp/dev/TestCodegenService.java 进行代码生成 - -## 3 maven 设置 -### 3.0 设置maven私服 用户密码 -将/mdp-dev/settings.xml拷贝到 C:\Users\Administrator\.m2目录下 - -### 3.1 安装本地jar包到私服（如果有本地jar包，目前有orcale的驱动包已经安装） -私服登录地址 http://203.195.131.73:8081/nexus 用户名、密码 admin/admin123 - -## 4 应用项目开发 -### 4.0 从svn下载应用工程项目 -svn 地址为 http://203.195.131.73:8085/svn/应用产品对应目录 - -### 4.1 从mven私服下载依赖jar包 -在 Eclipse 工程目录鼠标右键 -> Maven -> Update Project - -### 4.2 运行工程项目 -在src/main/java 中找到 ***Application。java -> 鼠标右键 -> Run as -> Java Application -或者 -在src/test/java 中找到 ***Application。java -> 鼠标右键 -> Run as -> Java Application - -## 5 打包部署 -### 5.0 工程打jar包 -在 Eclipse 工程目录鼠标右键 -> Run as -> Maven Install - -### 5.1 将打包好的jar包上传maven私服 -在 Eclipse 工程目录鼠标右键 -> Run as -> Maven Buil -> deploy - - - - -``` bash -# install dependencies -cnpm install - -# serve with hot reload at localhost:8081 -cnpm run dev - -# build for production with minification -cnpm run build - -``` - - -` 其它一些常用命令 ` -# 清除缓存 -npm cache clean --force - -# npm国内代理镜像服务器 镜像使用方法（三种办法任意一种都能解决问题，建议使用第三种，将配置写死，下次用的时候配置还在）: -npm config set registry https://registry.npm.taobao.org -npm info underscore （如果上面配置正确这个命令会有字符串response） - - -# Browser support - -Modern browsers and IE 10+. - -# License -[MIT](http://opensource.org/licenses/MIT) diff --git a/mdp-form-bootstrap/src/main/resources/application-123prod.properties b/mdp-form-bootstrap/src/main/resources/application-123prod.properties deleted file mode 100644 index ba24d05..0000000 --- a/mdp-form-bootstrap/src/main/resources/application-123prod.properties +++ /dev/null @@ -1,82 +0,0 @@ -#内置服务器的端口 -spring.application.name=form - -server.port=7013 -server.context-path=/${spring.application.name} -#session失效时间 秒 -server.session.timeout=43200 -spring.session.store-type=none -#eureka.instance.preferIpAddress=true -spring.cloud.inetutils.preferredNetworks[0]=^10\. -spring.cloud.inetutils.preferredNetworks[1]=^172\. -#eureka.client.serviceUrl.defaultZone=http://172.18.153.157:6110/eureka/ - -spring.cloud.consul.host=localhost -spring.cloud.consul.port=8500 - - -#服务跟踪 -spring.zipkin.enabled=false -spring.zipkin.base-url=http://172.18.153.159:6119/ -spring.sleuth.sampler.percentage=1.0 - - - -spring.jackson.mapper.default-view-inclusion=false -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -spring.mvc.date-format=yyyy-MM-dd HH:mm:ss -spring.jackson.time-zone=GMT+8 -spring.jackson.serialization.indent_output=true -spring.jackson.serialization.fail_on_empty_beans=false -spring.jackson.deserialization.fail_on_unknown_properties=false -spring.jackson.parser.allow_unquoted_control_chars=true -spring.jackson.parser.allow_single_quotes=true - -mdp.arc.upload-root-path=C:/archive/attachment - -#mdp.auth.ips=ip1,ip2,ip3,授权ip地址列表，如果非授权ip应用只允许使用24小时 -mdp.auth.ips=172.18.153.159 - - -#配置数据源 -#配置数据源 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://rm-wz929m40310oa78u6.mysql.rds.aliyuncs.com:3306/adm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT -spring.datasource.username=mall -spring.datasource.password=mall_0319_m -spring.datasource.validation-query=select 1 -spring.datasource.test-on-borrow=true -spring.datasource.validation-interval=30000 - - -#更多数据源 -#custom.datasource.names=ds1 -#custom.datasource.ds1.driver-class-name=net.ucanaccess.jdbc.UcanaccessDriver -#custom.datasource.ds1.mdb-path=./mdb/FileScanData.mdb -#custom.datasource.ds1.url=jdbc:ucanaccess://./mdb/FileScanData.mdb;memory=false; -#custom.datasource.ds1.username=xb21cn -#custom.datasource.ds1.password= -#custom.datasource.ds1.validation-query=select 1 -#custom.datasource.ds1.test-on-borrow=false -#custom.datasource.ds1.test-while-idle=true -#custom.datasource.ds1.time-between-eviction-runs-millis=5000 - - # REDIS (RedisProperties) -# Redis数据库索引（默认为0） -spring.redis.database=0 -# Redis服务器地址 -spring.redis.host=172.18.153.171 -# Redis服务器连接端口 -spring.redis.port=6379 -# Redis服务器连接密码（默认为空） -spring.redis.password=QqKj*123 -# 连接池最大连接数（使用负值表示没有限制） -spring.redis.pool.max-active=8 -# 连接池最大阻塞等待时间（使用负值表示没有限制） -spring.redis.pool.max-wait=-1 -# 连接池中的最大空闲连接 -spring.redis.pool.max-idle=8 -# 连接池中的最小空闲连接 -spring.redis.pool.min-idle=2 -# 连接超时时间（毫秒） -spring.redis.timeout=100000 \ No newline at end of file diff --git a/mdp-form-bootstrap/src/main/resources/application-dev.properties b/mdp-form-bootstrap/src/main/resources/application-dev.properties deleted file mode 100644 index a789e8b..0000000 --- a/mdp-form-bootstrap/src/main/resources/application-dev.properties +++ /dev/null @@ -1,144 +0,0 @@ -#内置服务器的端口 -spring.application.name=form - -server.port=7013 -#server.context-path=/${spring.application.name} -#session失效时间 秒 -server.session.timeout=43200 -spring.session.store-type=none -#eureka.instance.preferIpAddress=true -spring.cloud.inetutils.preferredNetworks[0]=^10\. -spring.cloud.inetutils.preferredNetworks[1]=^172\. -#eureka.client.serviceUrl.defaultZone=http://172.16.16.16:6110/eureka/ - -spring.cloud.consul.host=134.175.57.249 -spring.cloud.consul.port=8500 - - -#服务跟踪 -spring.zipkin.enabled=false -spring.zipkin.base-url=http://134.175.57.249:6119/ -spring.sleuth.sampler.percentage=1.0 - - - -spring.jackson.mapper.default-view-inclusion=false -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -spring.mvc.date-format=yyyy-MM-dd HH:mm:ss -spring.jackson.time-zone=GMT+8 -spring.jackson.serialization.indent_output=true -spring.jackson.serialization.fail_on_empty_beans=false -spring.jackson.deserialization.fail_on_unknown_properties=false -spring.jackson.parser.allow_unquoted_control_chars=true -spring.jackson.parser.allow_single_quotes=true - -mdp.arc.upload-root-path=C:/archive/attachment - -#mdp.auth.ips=ip1,ip2,ip3,授权ip地址列表，如果非授权ip应用只允许使用24小时 -mdp.auth.ips=10.0.0.17 - - -mdp.api-gate=http://134.175.57.249:7015 -mdp.platform-branch-id=platform-branch-001 - -# 权限自动注册接口，云环境下 http://微服务名称/sys/qx/autoRegist，本地调试 http://ip:port/sys/qx/autoRegist -mdp.auth.qx-regist-url=${mdp.api-gate}/sys/sys/qx/autoRegist -# 审计日志收集，云环境下 http://微服务名称/audit/base/operLog/add，本地调试 http://ip:port/audit/base/operLog/add -mdp.audit.audit-log-url=${mdp.api-gate}/audit/audit/base/operLog/add -# 元数据/系统参数等接口 云环境下 http://微服务名称/sys/meta/itemOption/list/byItemCode，本地调试 http://ip:port/meta/itemOption/list/byItemCode -mdp.meta.item-options-query-uri= ${mdp.api-gate}/sys/meta/itemOption/list/byItemCode -# 元数据/系统参数等接口 云环境下 http://微服务名称/sys/meta/item/list，本地调试 http://ip:port/meta/item/list -mdp.meta.items-query-uri= ${mdp.api-gate}//sys/meta/item/list -# 第三方授权登陆参数配置数据访问接口 云环境下 http://微服务名称/app/appTpAuth/list，本地调试 http://ip:port/app/appTpAuth/list -mdp.tpa.app-tp-auth-query-uri= ${mdp.api-gate}/sys/app/appTpAuth/list -# 第三方授权支付参数配置数据访问接口 云环境下 http://微服务名称/app/appTpPay/list，本地调试 http://ip:port/app/appTpPay/list -mdp.tpa.app-tp-pay-query-uri= ${mdp.api-gate}/sys/app/appTpPay/list -# 第三方授权登陆登陆用户查询接口 云环境下 http://微服务名称/sys/userTpa/list，本地调试 http://ip:port/sys/userTpa/list -mdp.tpa.user-tpa-query-uri= ${mdp.api-gate}/sys/sys/userTpa/list - - -# mdp平台授权验证服务器访问地址 cloud环境下换成 http://oauth2server，本地调试http://127.0.0.1:7000，本地如果不起验证服务器，可改为 https://www.qingqinkj.com/api/m1/oauth2server -mdp.oauth2.server.uri=http://134.175.57.249:7000 -# 客户端必须在数据库表adm.oauth_client_details中配置，否则无法访问 - -# 下面配置 password 模式 -spring.security.oauth2.client.registration.password-client.provider=oauth2server -spring.security.oauth2.client.registration.password-client.client-id=${spring.application.name} -spring.security.oauth2.client.registration.password-client.client-secret= ${spring.application.name}-8888 -spring.security.oauth2.client.registration.password-client.authorization-grant-type= password -spring.security.oauth2.client.registration.password-client.scope= all - -# 下面配置 client_credentials 模式 -spring.security.oauth2.client.registration.def-client.provider=oauth2server -spring.security.oauth2.client.registration.def-client.client-id=${spring.application.name} -spring.security.oauth2.client.registration.def-client.client-secret= ${spring.application.name}-8888 -spring.security.oauth2.client.registration.def-client.authorization-grant-type= client_credentials -spring.security.oauth2.client.registration.def-client.scope= all - -# 下面配置authorization_code模式 -spring.security.oauth2.client.registration.code-client.provider=oauth2server -spring.security.oauth2.client.registration.code-client.client-id=${spring.application.name} -spring.security.oauth2.client.registration.code-client.client-secret= ${spring.application.name}-8888 -spring.security.oauth2.client.registration.code-client.authorization-grant-type= authorization_code -# 授权码模式下需要配置重定向地址 -spring.security.oauth2.client.registration.code-client.redirect-uri= ${messages.base-uri}/authorized -spring.security.oauth2.client.registration.code-client.scope= all - -# 授权码方式获取code -spring.security.oauth2.client.provider.oauth2server.authorization-uri= ${mdp.oauth2.server.uri}/oauth2/authorize -# 获取token接口 -spring.security.oauth2.client.provider.oauth2server.token-uri= ${mdp.oauth2.server.uri}/oauth2/token - -# 资源服务器 -spring.security.oauth2.resourceserver.jwt.jwk-set-uri= ${mdp.oauth2.server.uri}/oauth2/jwks - - -#配置数据源 -#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -#spring.datasource.jdbc-url=jdbc:mysql://193.112.138.144:3306/adm -#spring.datasource.username=root -#spring.datasource.password=lqaz@WSX -#spring.datasource.validation-query=select 1 -#spring.datasource.test-on-borrow=true -#spring.datasource.validation-interval=30000 - -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://123.207.117.5:3306/form?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT -spring.datasource.username=root -spring.datasource.password=1qaz@WSX -spring.datasource.validation-query=SELECT 1 -spring.datasource.test-on-borrow=true -spring.datasource.validation-interval=30000 - - -#更多数据源 -#custom.datasource.names=ds1 -#custom.datasource.ds1.driver-class-name=net.ucanaccess.jdbc.UcanaccessDriver -#custom.datasource.ds1.mdb-path=./mdb/FileScanData.mdb -#custom.datasource.ds1.url=jdbc:ucanaccess://./mdb/FileScanData.mdb;memory=false; -#custom.datasource.ds1.username=xb21cn -#custom.datasource.ds1.password= -#custom.datasource.ds1.validation-query=select 1 -#custom.datasource.ds1.test-on-borrow=false -#custom.datasource.ds1.test-while-idle=true -#custom.datasource.ds1.time-between-eviction-runs-millis=5000 - - # REDIS (RedisProperties) -# Redis数据库索引（默认为0） -spring.redis.database=0 -# Redis服务器地址 -spring.redis.host=134.175.57.249 -# Redis服务器连接端口 -spring.redis.port=6379 -# Redis服务器连接密码（默认为空） -spring.redis.password=QqKj*123 -# 连接池最大连接数（使用负值表示没有限制） -spring.redis.pool.max-active=8 -# 连接池最大阻塞等待时间（使用负值表示没有限制） -spring.redis.pool.max-wait=-1 -# 连接池中的最大空闲连接 -spring.redis.pool.max-idle=8 -# 连接池中的最小空闲连接 -spring.redis.pool.min-idle=2 -# 连接超时时间（毫秒） -spring.redis.timeout=100000 \ No newline at end of file diff --git a/mdp-form-bootstrap/src/main/resources/application-m1prod.properties b/mdp-form-bootstrap/src/main/resources/application-m1prod.properties deleted file mode 100644 index 8e0c130..0000000 --- a/mdp-form-bootstrap/src/main/resources/application-m1prod.properties +++ /dev/null @@ -1,153 +0,0 @@ -#内置服务器的端口 -spring.application.name=form - -server.port=7013 -#server.context-path=/${spring.application.name} -spring.aop.proxy-target-class=true -server.tomcat.util.http.parser.HttpParser.requestTargetAllow=|[]{} -#session失效时间 秒 -server.session.timeout=43200 -spring.session.store-type=none -#eureka.instance.preferIpAddress=true -spring.cloud.inetutils.preferredNetworks[0]=^10\. -spring.cloud.inetutils.preferredNetworks[1]=^172\. -#eureka.client.serviceUrl.defaultZone=http://172.16.16.16:6110/eureka/ - -spring.cloud.consul.host=localhost -spring.cloud.consul.port=8500 - -#服务跟踪 -spring.zipkin.enabled=false -spring.zipkin.base-url=http://172.16.16.16:6119/ -spring.sleuth.sampler.percentage=1.0 - - - -#配置数据源 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://10.0.0.5:3306/form?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT -spring.datasource.url=jdbc:mysql://10.0.0.5:3306/form?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT - -spring.datasource.username=root -spring.datasource.password=1qaz@WSX -spring.datasource.validation-query=SELECT 1 -spring.datasource.test-on-borrow=true -spring.datasource.validation-interval=30000 -#限制文件上传大小 -spring.http.multipart.maxFileSize=10Mb -spring.http.multipart.maxRequestSize=10Mb - - -#更多数据源 -mdp.datasource.names=adm-ds -spring.datasource.adm-ds.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.adm-ds.jdbc-url=jdbc:mysql://123.207.117.5:3306/adm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT&allowPublicKeyRetrieval=true -spring.datasource.adm-ds.username=root -spring.datasource.adm-ds.password=1qaz@WSX - -spring.jackson.mapper.default-view-inclusion=false -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -spring.mvc.date-format=yyyy-MM-dd HH:mm:ss -spring.jackson.time-zone=GMT+8 -spring.jackson.serialization.indent_output=true -spring.jackson.serialization.fail_on_empty_beans=false -spring.jackson.deserialization.fail_on_unknown_properties=false -spring.jackson.parser.allow_unquoted_control_chars=true -spring.jackson.parser.allow_single_quotes=true - - -#mdp.auth.ips=ip1,ip2,ip3,授权ip地址列表，如果非授权ip应用只允许使用24小时 -mdp.auth.ips=172.18.153.152 - -mdp.arc.upload-root-path=C:/archive/attachment - -#配置图片文件上传下载的相关参数，如果此次配置将覆盖数据库系统参数中的 arcImageUploadRootPath 及 arcImageDownloadBaseUri两个参数 -mdp.arc.image-upload-root-path=D:/arc/image -mdp.arc.image-download-base-uri=arc/ -mdp.arc.file-upload-root-path=D:/arc/files -mdp.arc.file-download-base-uri=arc/ -#begin ac 会计核心账户相关配置 -#账户金额数据签名用于生成md5的key值 -mdp.ac.account-key=LFt1f0EtISBDkqVk9H90rSKVixXhw9eDECClaly2Mj5 -mdp.ac.account-check-sign=true -###end ac########## - - -mdp.api-gate=http://gate -mdp.platform-branch-id=platform-branch-001 - -# 权限自动注册接口，云环境下 http://微服务名称/sys/qx/autoRegist，本地调试 http://ip:port/sys/qx/autoRegist -mdp.auth.qx-regist-url=http://sys/sys/qx/autoRegist -# 审计日志收集，云环境下 http://微服务名称/audit/base/operLog/add，本地调试 http://ip:port/audit/base/operLog/add -mdp.audit.audit-log-url=http://audit/audit/base/operLog/add -# 元数据/系统参数等接口 云环境下 http://微服务名称/sys/meta/itemOption/list/byItemCode，本地调试 http://ip:port/meta/itemOption/list/byItemCode -mdp.meta.item-options-query-uri= http://sys/meta/itemOption/list/byItemCode -# 元数据/系统参数等接口 云环境下 http://微服务名称/sys/meta/item/list，本地调试 http://ip:port/meta/item/list -mdp.meta.items-query-uri= http://sys/meta/item/list -# 第三方授权登陆参数配置数据访问接口 云环境下 http://微服务名称/app/appTpAuth/list，本地调试 http://ip:port/app/appTpAuth/list -mdp.tpa.app-tp-auth-query-uri= http://sys/app/appTpAuth/list -# 第三方授权支付参数配置数据访问接口 云环境下 http://微服务名称/app/appTpPay/list，本地调试 http://ip:port/app/appTpPay/list -mdp.tpa.app-tp-pay-query-uri= http://sys/app/appTpPay/list -# 第三方授权登陆登陆用户查询接口 云环境下 http://微服务名称/sys/userTpa/list，本地调试 http://ip:port/sys/userTpa/list -mdp.tpa.user-tpa-query-uri= http://sys/sys/userTpa/list - -# mdp平台授权验证服务器访问地址 cloud环境下换成 http://oauth2server，本地调试如果不起验证服务器，可改为 https://www.qingqinkj.com/api/m1/oauth2server -# oauth2client服务比较特殊，oauth2client工程访问oauth2server要通过非cloud方式访问。即http://ip:port/的方式，或者https://www.qingqinkj.com/api/m1/oauth2server -mdp.oauth2.server.uri= http://oauth2server - -# 下面配置 password 模式 -spring.security.oauth2.client.registration.password-client.provider=def-oauth-server -spring.security.oauth2.client.registration.password-client.client-id=${spring.application.name} -spring.security.oauth2.client.registration.password-client.client-secret= ${spring.application.name}-8888 -spring.security.oauth2.client.registration.password-client.authorization-grant-type= password -spring.security.oauth2.client.registration.password-client.scope= all - -# 下面配置 client_credentials 模式 -spring.security.oauth2.client.registration.def-client.provider=def-oauth-server -spring.security.oauth2.client.registration.def-client.client-id=${spring.application.name} -spring.security.oauth2.client.registration.def-client.client-secret= ${spring.application.name}-8888 -spring.security.oauth2.client.registration.def-client.authorization-grant-type= client_credentials -spring.security.oauth2.client.registration.def-client.scope= all - -# 下面配置authorization_code模式 -spring.security.oauth2.client.registration.code-client.provider=def-oauth-server -spring.security.oauth2.client.registration.code-client.client-id=${spring.application.name} -spring.security.oauth2.client.registration.code-client.client-secret= ${spring.application.name}-8888 -spring.security.oauth2.client.registration.code-client.authorization-grant-type= authorization_code -# 授权码模式下需要配置重定向地址 -spring.security.oauth2.client.registration.code-client.redirect-uri= ${messages.base-uri}/authorized -spring.security.oauth2.client.registration.code-client.scope= all - -# 授权码方式获取code -spring.security.oauth2.client.provider.def-oauth-server.authorization-uri= ${mdp.oauth2.server.uri}/oauth2/authorize -# 获取token接口 -spring.security.oauth2.client.provider.def-oauth-server.token-uri= ${mdp.oauth2.server.uri}/oauth2/token - -# 资源服务器 -spring.security.oauth2.resourceserver.jwt.jwk-set-uri= ${mdp.oauth2.server.uri}/oauth2/jwks - -##begin 商户相关配置###顶级商户########################################################### -mdp.topMech.mechId=m1000 -mdp.topMech.userid=m1000 -mdp.topMech.accountId=m1000 -##end 商户相关配置################################################################ - -# REDIS (RedisProperties) -# Redis数据库索引（默认为0） -spring.redis.database=0 -# Redis服务器地址 -spring.redis.host=172.16.16.16 -# Redis服务器连接端口 -spring.redis.port=6379 -# Redis服务器连接密码（默认为空） -spring.redis.password=QqKj*123 -# 连接池最大连接数（使用负值表示没有限制） -spring.redis.pool.max-active=8 -# 连接池最大阻塞等待时间（使用负值表示没有限制） -spring.redis.pool.max-wait=-1 -# 连接池中的最大空闲连接 -spring.redis.pool.max-idle=8 -# 连接池中的最小空闲连接 -spring.redis.pool.min-idle=2 -# 连接超时时间（毫秒） -spring.redis.timeout=100000 \ No newline at end of file diff --git a/mdp-form-bootstrap/src/main/resources/application-prod.properties b/mdp-form-bootstrap/src/main/resources/application-prod.properties deleted file mode 100644 index 34468c3..0000000 --- a/mdp-form-bootstrap/src/main/resources/application-prod.properties +++ /dev/null @@ -1,79 +0,0 @@ -#内置服务器的端口 -spring.application.name=form - -server.port=7013 -server.context-path=/${spring.application.name} -#session失效时间 秒 -server.session.timeout=43200 -spring.session.store-type=redis -#eureka.instance.preferIpAddress=true -spring.cloud.inetutils.preferredNetworks[0]=^10\. -spring.cloud.inetutils.preferredNetworks[1]=^172\. -#eureka.client.serviceUrl.defaultZone=http://134.175.57.249:6010/eureka/ - -spring.cloud.consul.host=localhost -spring.cloud.consul.port=8500 - - -#服务跟踪 -spring.zipkin.enabled=false -spring.zipkin.base-url=http://134.175.57.249:6019/ -spring.sleuth.sampler.percentage=1.0 - -spring.jackson.mapper.default-view-inclusion=false -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -spring.mvc.date-format=yyyy-MM-dd HH:mm:ss -spring.jackson.time-zone=GMT+8 -spring.jackson.serialization.indent_output=true -spring.jackson.serialization.fail_on_empty_beans=false -spring.jackson.deserialization.fail_on_unknown_properties=false -spring.jackson.parser.allow_unquoted_control_chars=true -spring.jackson.parser.allow_single_quotes=true - -#mdp.arc.upload-root-path=C:/archive/attachment - -#mdp.auth.ips=ip1,ip2,ip3,授权ip地址列表，如果非授权ip应用只允许使用24小时 -mdp.auth.ips=10.0.0.7 - - -#配置数据源 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://193.112.138.144:3306/adm -spring.datasource.username=root -spring.datasource.password=lqaz@WSX -spring.datasource.validation-query=select 1 -spring.datasource.test-on-borrow=true -spring.datasource.validation-interval=30000 - - -#更多数据源 -#custom.datasource.names=ds1 -#custom.datasource.ds1.driver-class-name=net.ucanaccess.jdbc.UcanaccessDriver -#custom.datasource.ds1.mdb-path=./mdb/FileScanData.mdb -#custom.datasource.ds1.url=jdbc:ucanaccess://./mdb/FileScanData.mdb;memory=false; -#custom.datasource.ds1.username=xb21cn -#custom.datasource.ds1.password= -#custom.datasource.ds1.validation-query=select 1 -#custom.datasource.ds1.test-on-borrow=false -#custom.datasource.ds1.test-while-idle=true -#custom.datasource.ds1.time-between-eviction-runs-millis=5000 - - # REDIS (RedisProperties) -# Redis数据库索引（默认为0） -spring.redis.database=0 -# Redis服务器地址 -spring.redis.host=134.175.57.249 -# Redis服务器连接端口 -spring.redis.port=6379 -# Redis服务器连接密码（默认为空） -spring.redis.password=QqKj*123 -# 连接池最大连接数（使用负值表示没有限制） -spring.redis.pool.max-active=8 -# 连接池最大阻塞等待时间（使用负值表示没有限制） -spring.redis.pool.max-wait=-1 -# 连接池中的最大空闲连接 -spring.redis.pool.max-idle=8 -# 连接池中的最小空闲连接 -spring.redis.pool.min-idle=2 -# 连接超时时间（毫秒） -spring.redis.timeout=100000 \ No newline at end of file diff --git a/mdp-form-bootstrap/src/main/resources/application-prod.yml b/mdp-form-bootstrap/src/main/resources/application-prod.yml new file mode 100644 index 0000000..7205ae3 --- /dev/null +++ b/mdp-form-bootstrap/src/main/resources/application-prod.yml @@ -0,0 +1,278 @@ +server: + port: 7013 + servlet: + context-path: /${spring.application.name} + session: + timeout: 43200 + storeType: none + tomcat: + max-swallow-size: -1 + util: + http: + parser: + HttpParser: requestTargetAllow=|{}[] + error: + include-exception: true + include-stacktrace: ALWAYS + include-message: ALWAYS + compression: + enabled: true + min-response-size: 1024 + mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* + +management: + endpoints: + web: + exposure: + include: metrics,httptrace + +spring: + cloud: + consul: + host: 134.175.57.249 + port: 8500 + inetutils: + preferredNetworks[0]: ^10\. + preferredNetworks[1]: ^172\. + discovery: + prefer-ip-address: true + healthCheckInterval: 15s + servlet: + multipart: + max-file-size: 10MB + max-request-size: 10MB + # 安全模块 + security: + oauth2: + resourceserver: + jwt: + jwk-set-uri: ${mdp.oauth2.server.uri}/oauth2/jwks + client: + # 下面配置 password 模式 + registration: + password-client: + provider: def-oauth-server + client-id: ${spring.application.name} + client-secret: ${spring.application.name}-8888 + authorization-grant-type: password + scope: all + # 下面配置 client_credentials 模式 + def-client: + provider: def-oauth-server + client-id: ${spring.application.name} + client-secret: ${spring.application.name}-8888 + authorization-grant-type: client_credentials + scope: all + # 下面配置authorization_code模式 + code-client: + provider: def-oauth-server + client-id: ${spring.application.name} + client-secret: ${spring.application.name}-8888 + authorization-grant-type: authorization_code + # 授权码模式下需要配置重定向地址 + redirect-uri: ${messages.base-uri}/authorized + scope: all + provider: + def-oauth-server: + # 授权码方式获取code + authorization-uri: ${mdp.oauth2.server.uri}/oauth2/authorize + # 获取token接口 + token-uri: ${mdp.oauth2.server.uri}/oauth2/token + mail: + host: smtp.mxhichina.com + port: 25 + username: kf@qingqinkj.com + password: QqKj@169$458 + default-encoding: UTF-8 + properties: + mail: + smtp: + auth: true + starttls: + enable: true + required: true + socketFactoryClass: javax.net.ssl.SSLSocketFactory + debug: true + jackson: + mapper: + default-view-inclusion: false + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + serialization: + indent_output: true + fail_on_empty_beans: false + deserialization: + fail_on_unknown_properties: false + parser: + allow_unquoted_control_chars: true + allow_single_quotes: true + + mvc: + date-format: yyyy-MM-dd HH:mm:ss + ## quartz定时任务,采用数据库方式 + quartz: + job-store-type: jdbc + initialize-schema: embedded + #定时任务启动开关，true-开 false-关 + auto-startup: false + #启动时更新己存在的Job + overwrite-existing-jobs: false + properties: + org: + quartz: + scheduler: + instanceName: MyScheduler + instanceId: AUTO + jobStore: + class: org.quartz.impl.jdbcjobstore.JobStoreTX + driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate + tablePrefix: QRTZ_ + isClustered: true + misfireThreshold: 60000 + clusterCheckinInterval: 10000 + threadPool: + class: org.quartz.simpl.SimpleThreadPool + threadCount: 10 + threadPriority: 5 + threadsInheritContextClassLoaderOfInitializingThread: true + jpa: + open-in-view: false + activiti: + check-process-definitions: false + #启用作业执行器 + async-executor-activate: false + #启用异步执行器 + job-executor-activate: false + aop: + proxy-target-class: true + #配置freemarker + freemarker: + # 设置模板后缀名 + suffix: .ftl + # 设置文档类型 + content-type: text/html + # 设置页面编码格式 + charset: UTF-8 + # 设置页面缓存 + cache: false + prefer-file-system-access: false + # 设置ftl文件路径 + template-loader-path: + - classpath:/templates + resource: + static-locations: classpath:/static/,classpath:/public/ + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + primary: master + strict: false, + druid: + stat-view-servlet: + enabled: true + loginUsername: root + loginPassword: 123456 + allow: + web-stat-filter: + enabled: true + dynamic: + druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置) + # 连接池的配置信息 + # 初始化大小，最小，最大 + initial-size: 5 + min-idle: 5 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + validationQuery: SELECT 1 + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + # 打开PSCache，并且指定每个连接上PSCache的大小 + poolPreparedStatements: true + maxPoolPreparedStatementPerConnectionSize: 20 + # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 + filters: stat,wall,slf4j + # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 + connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 + datasource: + master: + # url: jdbc:mysql://124.223.85.6:31605/erp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true + #username: zchcgl + #password: zchcgl123!@# + #driver-class-name: com.mysql.cj.jdbc.Driver + + url: jdbc:mysql://123.207.117.5:3306/form?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT + username: root + password: 1qaz@WSX + driver-class-name: com.mysql.cj.jdbc.Driver + + + # 多数据源配置 + #multi-datasource1: + #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + #username: root + #password: root + #driver-class-name: com.mysql.cj.jdbc.Driver + mem-ds: + url: jdbc:mysql://123.207.117.5:3306/form?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT + username: root + password: 1qaz@WSX + driver-class-name: com.mysql.cj.jdbc.Driver + mall-ds: + url: jdbc:mysql://123.207.117.5:3306/form?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT + username: root + password: 1qaz@WSX + driver-class-name: com.mysql.cj.jdbc.Driver + #redis 配置 + redis: + database: 0 + host: 134.175.57.249 + timeout: 300s + lettuce: + pool: + max-active: 8 #最大连接数据库连接数,设 -1 为没有限制 + max-idle: 20 #最大等待连接中的数量,设 0 为没有限制 + max-wait: 10000 #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 + min-idle: 8 #最小等待连接中的数量,设 0 为没有限制 + shutdown-timeout: 100ms + password: QqKj*123 + port: 6379 +#mybatis plus 设置 +mybatis-plus: + mapper-locations: classpath*:/**/**Mapper.xml + global-config: + # 关闭MP3.0自带的banner + banner: false + db-config: + #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)"; + id-type: ASSIGN_ID + # 默认数据库表下划线命名 + table-underline: true + logic-delete-value: 1 + logic-not-delete-value: 0 + configuration: + # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + # 返回类型为Map,显示null对应的字段 + call-setters-on-nulls: true + +#Mybatis输出sql日志 +logging: + level: + org.jeecg.modules.system.mapper : info + +# mdp平台授权验证服务器访问地址 cloud环境下换成 http://gate，本地调试如果不起验证服务器，可改为 https://www.qingqinkj.com/api/m1/oauth2/oauth2 +# 客户端必须在数据库表adm.oauth_client_details中配置，否则无法访问 +mdp: + api-gate: http://gate + platform-branch-id: platform-branch-001 + # 站点语言类型cn\en等 + site-type: cn + oauth2: + server: + uri: http://oauth2server + diff --git a/mdp-form-bootstrap/src/main/resources/application.properties b/mdp-form-bootstrap/src/main/resources/application.properties deleted file mode 100644 index c1b964f..0000000 --- a/mdp-form-bootstrap/src/main/resources/application.properties +++ /dev/null @@ -1,28 +0,0 @@ -## 开发/测试/生产环境分别对应dev/test/prod -spring.profiles.active=dev - -# 默认值为 /** -#spring.mvc.static-path-pattern=/** -# 默认值为 classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/ -#spring.resources.static-locations=classpath:META-INF/resources/,classpath:resources/,classpath:static/,classpath:public/ - - -#配置mybatis -mybatis.config-location=classpath:/mybatis/mybatis-config.xml -mybatis.mapperLocations=classpath*:/mybatis/mapper/**/*.xml - -#配置日志 -logging.level.root=debug - - -#配置thymeleaf -# THYMELEAF (ThymeleafAutoConfiguration) -spring.thymeleaf.prefix=classpath:/templates/ -spring.thymeleaf.suffix=.html -spring.thymeleaf.mode=HTML -spring.thymeleaf.enabled=false -spring.thymeleaf.encoding=UTF-8 -spring.thymeleaf.content-type=text/html -spring.thymeleaf.cache=true - - \ No newline at end of file diff --git a/mdp-form-bootstrap/src/main/resources/application.yml b/mdp-form-bootstrap/src/main/resources/application.yml new file mode 100644 index 0000000..20ccaa3 --- /dev/null +++ b/mdp-form-bootstrap/src/main/resources/application.yml @@ -0,0 +1,5 @@ +spring: + application: + name: form + profiles: + active: prod \ No newline at end of file diff --git a/mdp-form-bootstrap/src/main/resources/logback-spring.xml b/mdp-form-bootstrap/src/main/resources/logback-spring.xml index 91751ae..a5c7a1e 100644 --- a/mdp-form-bootstrap/src/main/resources/logback-spring.xml +++ b/mdp-form-bootstrap/src/main/resources/logback-spring.xml @@ -10,15 +10,12 @@ - logs/mdp_form.log - - logs/mdp_form-%d{yyyy-MM-dd}%i.log + logs/mdp_form.log + + logs/mdp_form.%d{yyyy-MM-dd}.%i.log - 10 - - 10MB - + 20 + 100MB [%X{gloNo}][%d{yyyy-MM-dd HH:mm:ss}][%-5level][%logger][%X{reqNo}] -%msg%n @@ -32,8 +29,8 @@ - - - + + + \ No newline at end of file diff --git a/mdp-form/src/main/resources/application-dev.properties b/mdp-form/src/main/resources/application-dev.properties deleted file mode 100644 index 745b843..0000000 --- a/mdp-form/src/main/resources/application-dev.properties +++ /dev/null @@ -1,116 +0,0 @@ -#内置服务器的端口 -server.port=7013 -server.context-path=/form -#session失效时间 秒 -server.session.timeout=43200 - -spring.jackson.mapper.default-view-inclusion=false -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -spring.mvc.date-format=yyyy-MM-dd HH:mm:ss -spring.jackson.time-zone=GMT+8 -spring.jackson.serialization.indent_output=true -spring.jackson.serialization.fail_on_empty_beans=false -spring.jackson.deserialization.fail_on_unknown_properties=false -spring.jackson.parser.allow_unquoted_control_chars=true -spring.jackson.parser.allow_single_quotes=true - -mdp.arc.upload.root-path=C:/archive/attachment - -mdp.settings[file.saveDir]=C:/work/file/ - - -mdp.api-gate=http://134.175.57.249:7015 -mdp.platform-branch-id=platform-branch-001 - -# 权限自动注册接口，云环境下 http://微服务名称/sys/qx/autoRegist，本地调试 http://ip:port/sys/qx/autoRegist -mdp.auth.qx-regist-url=${mdp.api-gate}/sys/sys/qx/autoRegist -# 审计日志收集，云环境下 http://微服务名称/audit/base/operLog/add，本地调试 http://ip:port/audit/base/operLog/add -mdp.audit.audit-log-url=${mdp.api-gate}/audit/audit/base/operLog/add -# 元数据/系统参数等接口 云环境下 http://微服务名称/sys/meta/itemOption/list/byItemCode，本地调试 http://ip:port/meta/itemOption/list/byItemCode -mdp.meta.item-options-query-uri= ${mdp.api-gate}/sys/meta/itemOption/list/byItemCode -# 元数据/系统参数等接口 云环境下 http://微服务名称/sys/meta/item/list，本地调试 http://ip:port/meta/item/list -mdp.meta.items-query-uri= ${mdp.api-gate}//sys/meta/item/list -# 第三方授权登陆参数配置数据访问接口 云环境下 http://微服务名称/app/appTpAuth/list，本地调试 http://ip:port/app/appTpAuth/list -mdp.tpa.app-tp-auth-query-uri= ${mdp.api-gate}/sys/app/appTpAuth/list -# 第三方授权支付参数配置数据访问接口 云环境下 http://微服务名称/app/appTpPay/list，本地调试 http://ip:port/app/appTpPay/list -mdp.tpa.app-tp-pay-query-uri= ${mdp.api-gate}/sys/app/appTpPay/list -# 第三方授权登陆登陆用户查询接口 云环境下 http://微服务名称/sys/userTpa/list，本地调试 http://ip:port/sys/userTpa/list -mdp.tpa.user-tpa-query-uri= ${mdp.api-gate}/sys/sys/userTpa/list - - -# mdp平台授权验证服务器访问地址 cloud环境下换成 http://oauth2server，本地调试http://127.0.0.1:7000，本地如果不起验证服务器，可改为 https://www.qingqinkj.com/api/m1/oauth2server -mdp.oauth2.server.uri=http://134.175.57.249:7000 -# 客户端必须在数据库表adm.oauth_client_details中配置，否则无法访问 - -# 下面配置 password 模式 -spring.security.oauth2.client.registration.password-client.provider=oauth2server -spring.security.oauth2.client.registration.password-client.client-id=${spring.application.name} -spring.security.oauth2.client.registration.password-client.client-secret= ${spring.application.name}-8888 -spring.security.oauth2.client.registration.password-client.authorization-grant-type= password -spring.security.oauth2.client.registration.password-client.scope= all - -# 下面配置 client_credentials 模式 -spring.security.oauth2.client.registration.def-client.provider=oauth2server -spring.security.oauth2.client.registration.def-client.client-id=${spring.application.name} -spring.security.oauth2.client.registration.def-client.client-secret= ${spring.application.name}-8888 -spring.security.oauth2.client.registration.def-client.authorization-grant-type= client_credentials -spring.security.oauth2.client.registration.def-client.scope= all - -# 下面配置authorization_code模式 -spring.security.oauth2.client.registration.code-client.provider=oauth2server -spring.security.oauth2.client.registration.code-client.client-id=${spring.application.name} -spring.security.oauth2.client.registration.code-client.client-secret= ${spring.application.name}-8888 -spring.security.oauth2.client.registration.code-client.authorization-grant-type= authorization_code -# 授权码模式下需要配置重定向地址 -spring.security.oauth2.client.registration.code-client.redirect-uri= ${messages.base-uri}/authorized -spring.security.oauth2.client.registration.code-client.scope= all - -# 授权码方式获取code -spring.security.oauth2.client.provider.oauth2server.authorization-uri= ${mdp.oauth2.server.uri}/oauth2/authorize -# 获取token接口 -spring.security.oauth2.client.provider.oauth2server.token-uri= ${mdp.oauth2.server.uri}/oauth2/token - -# 资源服务器 -spring.security.oauth2.resourceserver.jwt.jwk-set-uri= ${mdp.oauth2.server.uri}/oauth2/jwks - -#配置数据源 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:oracle:thin:@203.195.131.73:1521:mdpdb -spring.datasource.username=root -spring.datasource.password=lqaz@WSX -spring.datasource.validation-query=select 1 -spring.datasource.test-on-borrow=true -spring.datasource.validation-interval=30000 - - -#更多数据源 -#custom.datasource.names=ds1 -#custom.datasource.ds1.driver-class-name=net.ucanaccess.jdbc.UcanaccessDriver -#custom.datasource.ds1.mdb-path=./mdb/FileScanData.mdb -#custom.datasource.ds1.url=jdbc:ucanaccess://./mdb/FileScanData.mdb;memory=false; -#custom.datasource.ds1.username=xb21cn -#custom.datasource.ds1.password= -#custom.datasource.ds1.validation-query=select 1 -#custom.datasource.ds1.test-on-borrow=false -#custom.datasource.ds1.test-while-idle=true -#custom.datasource.ds1.time-between-eviction-runs-millis=5000 - - # REDIS (RedisProperties) -# Redis数据库索引（默认为0） -spring.redis.database=0 -# Redis服务器地址 -spring.redis.host=134.175.57.249 -# Redis服务器连接端口 -spring.redis.port=6379 -# Redis服务器连接密码（默认为空） -spring.redis.password=QqKj*123 -# 连接池最大连接数（使用负值表示没有限制） -spring.redis.pool.max-active=8 -# 连接池最大阻塞等待时间（使用负值表示没有限制） -spring.redis.pool.max-wait=-1 -# 连接池中的最大空闲连接 -spring.redis.pool.max-idle=8 -# 连接池中的最小空闲连接 -spring.redis.pool.min-idle=2 -# 连接超时时间（毫秒） -spring.redis.timeout=100000 \ No newline at end of file diff --git a/mdp-form/src/main/resources/application-dev.yml b/mdp-form/src/main/resources/application-dev.yml new file mode 100644 index 0000000..d5fac87 --- /dev/null +++ b/mdp-form/src/main/resources/application-dev.yml @@ -0,0 +1,278 @@ +server: + port: 7013 + servlet: + context-path: /${spring.application.name} + session: + timeout: 43200 + storeType: none + tomcat: + max-swallow-size: -1 + util: + http: + parser: + HttpParser: requestTargetAllow=|{}[] + error: + include-exception: true + include-stacktrace: ALWAYS + include-message: ALWAYS + compression: + enabled: true + min-response-size: 1024 + mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* + +management: + endpoints: + web: + exposure: + include: metrics,httptrace + +spring: + cloud: + consul: + host: 134.175.57.249 + port: 8500 + inetutils: + preferredNetworks[0]: ^10\. + preferredNetworks[1]: ^172\. + servlet: + multipart: + max-file-size: 10MB + max-request-size: 10MB + # 安全模块 + security: + oauth2: + resourceserver: + jwt: + jwk-set-uri: ${mdp.oauth2.server.uri}/oauth2/jwks + client: + # 下面配置 password 模式 + registration: + password-client: + provider: def-oauth-server + client-id: ${spring.application.name} + client-secret: ${spring.application.name}-8888 + authorization-grant-type: password + scope: all + # 下面配置 client_credentials 模式 + def-client: + provider: def-oauth-server + client-id: ${spring.application.name} + client-secret: ${spring.application.name}-8888 + authorization-grant-type: client_credentials + scope: all + # 下面配置authorization_code模式 + code-client: + provider: def-oauth-server + client-id: ${spring.application.name} + client-secret: ${spring.application.name}-8888 + authorization-grant-type: authorization_code + # 授权码模式下需要配置重定向地址 + redirect-uri: ${messages.base-uri}/authorized + scope: all + provider: + def-oauth-server: + # 授权码方式获取code + authorization-uri: ${mdp.oauth2.server.uri}/oauth2/authorize + # 获取token接口 + token-uri: ${mdp.oauth2.server.uri}/oauth2/token + mail: + host: smtp.mxhichina.com + port: 25 + username: kf@qingqinkj.com + password: QqKj@169$458 + default-encoding: UTF-8 + properties: + mail: + smtp: + auth: true + starttls: + enable: true + required: true + socketFactoryClass: javax.net.ssl.SSLSocketFactory + debug: true + jackson: + mapper: + default-view-inclusion: false + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + serialization: + indent_output: true + fail_on_empty_beans: false + deserialization: + fail_on_unknown_properties: false + parser: + allow_unquoted_control_chars: true + allow_single_quotes: true + + mvc: + date-format: yyyy-MM-dd HH:mm:ss + ## quartz定时任务,采用数据库方式 + quartz: + job-store-type: jdbc + initialize-schema: embedded + #定时任务启动开关，true-开 false-关 + auto-startup: false + #启动时更新己存在的Job + overwrite-existing-jobs: false + properties: + org: + quartz: + scheduler: + instanceName: MyScheduler + instanceId: AUTO + jobStore: + class: org.quartz.impl.jdbcjobstore.JobStoreTX + driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate + tablePrefix: QRTZ_ + isClustered: true + misfireThreshold: 60000 + clusterCheckinInterval: 10000 + threadPool: + class: org.quartz.simpl.SimpleThreadPool + threadCount: 10 + threadPriority: 5 + threadsInheritContextClassLoaderOfInitializingThread: true + jpa: + open-in-view: false + activiti: + check-process-definitions: false + #启用作业执行器 + async-executor-activate: false + #启用异步执行器 + job-executor-activate: false + aop: + proxy-target-class: true + #配置freemarker + freemarker: + # 设置模板后缀名 + suffix: .ftl + # 设置文档类型 + content-type: text/html + # 设置页面编码格式 + charset: UTF-8 + # 设置页面缓存 + cache: false + prefer-file-system-access: false + # 设置ftl文件路径 + template-loader-path: + - classpath:/templates + resource: + static-locations: classpath:/static/,classpath:/public/ + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + primary: master + strict: false, + druid: + stat-view-servlet: + enabled: true + loginUsername: root + loginPassword: 123456 + allow: + web-stat-filter: + enabled: true + dynamic: + druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置) + # 连接池的配置信息 + # 初始化大小，最小，最大 + initial-size: 5 + min-idle: 5 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + validationQuery: SELECT 1 + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + # 打开PSCache，并且指定每个连接上PSCache的大小 + poolPreparedStatements: true + maxPoolPreparedStatementPerConnectionSize: 20 + # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 + filters: stat,wall,slf4j + # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 + connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 + datasource: + master: + # url: jdbc:mysql://124.223.85.6:31605/erp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true + #username: zchcgl + #password: zchcgl123!@# + #driver-class-name: com.mysql.cj.jdbc.Driver + + url: jdbc:mysql://123.207.117.5:3306/form?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT + username: root + password: 1qaz@WSX + driver-class-name: com.mysql.cj.jdbc.Driver + + + # 多数据源配置 + #multi-datasource1: + #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + #username: root + #password: root + #driver-class-name: com.mysql.cj.jdbc.Driver + mem-ds: + url: jdbc:mysql://123.207.117.5:3306/form?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT + username: root + password: 1qaz@WSX + driver-class-name: com.mysql.cj.jdbc.Driver + mall-ds: + url: jdbc:mysql://123.207.117.5:3306/form?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT + username: root + password: 1qaz@WSX + driver-class-name: com.mysql.cj.jdbc.Driver + #redis 配置 + redis: + database: 0 + host: 134.175.57.249 + timeout: 300s + lettuce: + pool: + max-active: 8 #最大连接数据库连接数,设 -1 为没有限制 + max-idle: 20 #最大等待连接中的数量,设 0 为没有限制 + max-wait: 10000 #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 + min-idle: 8 #最小等待连接中的数量,设 0 为没有限制 + shutdown-timeout: 100ms + password: QqKj*123 + port: 6379 +#mybatis plus 设置 +mybatis-plus: + mapper-locations: classpath*:/**/**Mapper.xml + global-config: + # 关闭MP3.0自带的banner + banner: false + db-config: + #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)"; + id-type: ASSIGN_ID + # 默认数据库表下划线命名 + table-underline: true + logic-delete-value: 1 + logic-not-delete-value: 0 + configuration: + # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + # 返回类型为Map,显示null对应的字段 + call-setters-on-nulls: true + +#Mybatis输出sql日志 +logging: + level: + org.jeecg.modules.system.mapper : info + +# mdp平台授权验证服务器访问地址 cloud环境下换成 http://gate，本地调试如果不起验证服务器，可改为 https://www.qingqinkj.com/api/m1/oauth2/oauth2 +# 客户端必须在数据库表adm.oauth_client_details中配置，否则无法访问 +mdp: + api-gate: http://134.175.57.249:6101 + platform-branch-id: platform-branch-001 + # 站点语言类型cn\en等 + site-type: cn + jwt: + # 是否进行密钥检查，在开发环境中，涉及多个认证中心签发的jwt的时候，为了调试方便，可以暂时设为false + valid-secure: false + oauth2: + server: + uri: http://134.175.57.249:7000 + diff --git a/mdp-form/src/main/resources/application-prod.properties b/mdp-form/src/main/resources/application-prod.properties deleted file mode 100644 index becab7d..0000000 --- a/mdp-form/src/main/resources/application-prod.properties +++ /dev/null @@ -1,30 +0,0 @@ -#内置服务器的端口 -server.port=7013 -server.context-path=/form -#session失效时间 秒 -server.session.timeout=43200 - -mdp.settings[file.saveDir]=D:/cfm/file/ -#配置数据源 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:oracle:thin:@203.195.131.73:1521:mdpdb -spring.datasource.username=root -spring.datasource.password=lqaz@WSX -spring.datasource.validation-query=select 1 -spring.datasource.test-on-borrow=true -spring.datasource.validation-interval=30000 -spring.datasource.test-while-idle=true -spring.datasource.time-between-eviction-runs-millis=5000 - - -#更多数据源 -#custom.datasource.names=ds1 -#custom.datasource.ds1.driver-class-name=net.ucanaccess.jdbc.UcanaccessDriver -#custom.datasource.ds1.mdb-path=./mdb/FileScanData.mdb -#custom.datasource.ds1.url=jdbc:ucanaccess://./mdb/FileScanData.mdb;memory=false; -#custom.datasource.ds1.username=xb21cn -#custom.datasource.ds1.password= -#custom.datasource.ds1.validation-query=select 1 -#custom.datasource.ds1.test-on-borrow=false -#custom.datasource.ds1.test-while-idle=true -#custom.datasource.ds1.time-between-eviction-runs-millis=5000 \ No newline at end of file diff --git a/mdp-form/src/main/resources/application.properties b/mdp-form/src/main/resources/application.properties deleted file mode 100644 index cb3f92e..0000000 --- a/mdp-form/src/main/resources/application.properties +++ /dev/null @@ -1,19 +0,0 @@ -## 开发/测试/生产环境分别对应dev/test/prod -spring.profiles.active=dev - -# 默认值为 /** -#spring.mvc.static-path-pattern=/** -# 默认值为 classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/ -#spring.resources.static-locations=classpath:META-INF/resources/,classpath:resources/,classpath:static/,classpath:public/ - - - -#配置mybatis -mybatis.config-location=classpath:/mybatis/mybatis-config.xml -mybatis.mapperLocations=classpath*:/mybatis/mapper/**/*.xml - -#配置日志 -logging.level.root=debug -spring.session.storeType=NONE - - \ No newline at end of file diff --git a/mdp-form/src/main/resources/application.yml b/mdp-form/src/main/resources/application.yml new file mode 100644 index 0000000..a7b5868 --- /dev/null +++ b/mdp-form/src/main/resources/application.yml @@ -0,0 +1,5 @@ +spring: + application: + name: form + profiles: + active: dev \ No newline at end of file diff --git a/mdp-form/src/main/resources/logback-spring.xml b/mdp-form/src/main/resources/logback-spring.xml index 7c5f957..d509318 100644 --- a/mdp-form/src/main/resources/logback-spring.xml +++ b/mdp-form/src/main/resources/logback-spring.xml @@ -3,25 +3,22 @@ - [%d{yyyy-MM-dd HH:mm:ss}][%thread][%-5level][%X{sessionid}][%X{userid}][%X{openid}][%X{ip}][%logger] -%msg%n + [%X{gloNo}][%d{yyyy-MM-dd HH:mm:ss}][%-5level][%logger][%X{reqNo}] -%msg%n - logs/mdp_form.log - - logs/mdp_form-%d{yyyy-MM-dd}%i.log + logs/mdp_form.log + + logs/mdp_form.%d{yyyy-MM-dd}.%i.log - 10 - - 10MB - + 20 + 100MB - [%d{yyyy-MM-dd HH:mm:ss}][%thread][%-5level][%X{sessionid}][%X{userid}][%X{openid}][%X{ip}][%logger] -%msg%n + [%X{gloNo}][%d{yyyy-MM-dd HH:mm:ss}][%-5level][%logger][%X{reqNo}] -%msg%n @@ -33,7 +30,7 @@ - +