zq-erp/src/main/resources/config/application-meidu.properties
@@ -1,74 +1,7 @@ evn=prd server.port=8080 #数据库链接 spring.datasource.username=meidu_data spring.datasource.password=meidu_4321#&@ spring.datasource.url=jdbc:mysql://47.111.134.136/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.initialSize=3 spring.datasource.minIdle=3 spring.datasource.maxActive=20 spring.datasource.maxWait=60000 spring.datasource.timeBetweenEvictionRunsMillis=60000 spring.datasource.minEvictableIdleTimeMillis=300000 spring.datasource.validationQuery=SELECT 1 FROM DUAL spring.datasource.testWhileIdle=true spring.datasource.testOnBorrow=true spring.datasource.testOnReturn=true spring.datasource.filters=stat,wall,log4j spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 spring.thymeleaf.prefix: classpath:/templates/views/ spring.thymeleaf.cache=false mybatis-plus.global-config.db-config.id-type=auto mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml #设置全局时间返回格式 第三行设置为true表示返回时间戳 #spring.jackson.date-format=yyyy-MM-dd #spring.jackson.time-zone=GMT+8 #spring.jackson.serialization.write-dates-as-timestamps=true #文件上传时的大小限制 单位M spring.servlet.multipart.max-file-size=300MB spring.servlet.multipart.max-request-size=300MB #-------------------------------------- #rabbitMQ配置 rabbitmq.host=47.111.134.136 rabbitmq.port=5672 rabbitmq.username=hivequeue rabbitmq.password=hivequeueadmin useRabbit=true #指定消费者确认方式 当为manual时手动确认 不配置表示自动确认 #spring.rabbitmq.listener.simple.acknowledge-mode=manual server.session.timeout=120 ali.sms.accessKeyId=LTAI4FrjY9R9iDfC6YQTHfne ali.sms.accessKeySecret=eSvQslpHpDSGlI9Hxm4y5MynNgLbCp ali.sms.regionId=cn-hangzhou ali.sms.signName=\u80bd\u598d #hour activities.groupBuy.limit=24 #minute groupBuy.pay.timeLimit=30 #定时任务 scheduling.enabled=true swagger.enable=false #默认头像 default.vip.photo.woman=https://filehive2.jyymatrix.cc/uploadeFile/20210125/db53552e688040afb286686f081e1e68f3fe946f75624598828f01898635152e.png default.vip.photo.man=https://filehive2.jyymatrix.cc/uploadeFile/20210125/3642f1d827c44c76832fea106c85e0f89e089c16cbcc4dd0a82bb52b9ac700f4.png #是否启用debug模式 @@ -76,64 +9,11 @@ # 日志文件保存地址 log_path=/mnt/md-hive/log # 系统语言环境 zh中文,us英文 system_language=zh # 错误密码允许输入的次数,大于五次后账号锁定,0表示不锁账号 error_password_times=5 # 默认密码 default_password=123 #nginx静态资源访问地址 static_resource_url=https://filehive2.jyymatrix.cc/uploadeFile/md/ #文件保存地址 file_storage_path=/mnt/hive/static/uploadeFile/md/ #文件上传大小字节为单位 10MB maxUploadSize=10485760 #Matser\u7684ip\u5730\u5740 redis.hostname=120.27.238.55 #\u7AEF\u53E3\u53F7 redis.port=6379 #\u5982\u679C\u6709\u5BC6\u7801 redis.password=xcong123 #\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000 redis.timeout=10000 redis.database=1 redis_time_out=1800000 cookie_time_out=36000 #APP登录公钥 login_public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB #APP登录秘钥 login_private_key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJa8rpRYK1Kn/yqdOrJR87TBuDgK7E57sh6INICYBN8edaoE+dtnvepDgD3S8ajAHuanleeYG+BPB9e0OHTzJ3hu2UfBIPdKFtHIZ8Z9XyVzjtlMuIkfTG643aId+d+PzNDmRyqKN6i2CCjasXxS7spJHcfFXI32Y7bYLqnWvnBVAgMBAAECgYBNzQFGq+NgfDllo1WCaG4jI8GTm3+wWoPq4l5G6S/KgYw1vu+/YOJTIZf1UQVOFitc3a6vpIDu25uup+Rj6IS8B4V8NDfc8P+iMNwdIKqqBj8wHu0/SaxYdW1uqlU5+XkJMxsNMgNRRGPSIQhla5OPHtBzIa7t4lmypETMZtXEmQJBAMsa1OIQzAKU05GweCnNNSoqo/nAQLqp8zfbJypxRx24uaCyS7C+KxN+O4FyaYmM9n0X+cgkr+RYHAIa7mg3gccCQQC9/nJvRBum8+4TINnz6QrvTmTlhi8QKW/CiRYpGgmo5PtQYw4BkRQbYO8ktFDM2yeO75XBv09qnGQaivDCeL0DAkEAisFg8LSy+4x7YcvivAQirxUEg2qRjjTvIZjKEBflkuuRfbRxO2Uf/qg9tPjaGwu/lcScc9yEggaj09hcSbyqHwJAN8QLiqUPCL3oTy0BTBpG316/Nq9f+Ppwl0TtgDroQu6S5VFttwACStb02m0imj5pKgcgibHBeaVVrITDjhEqSQJAaCHD/ytTzgtgLoVVyZZxOB272W7PI3mnzL8qQSldx1/QOBs1NmmEZuo7ELFMrfTmlxa1qR4gsq/ImfIdUdXewQ== #是否启用异常上报 is_open_exception_report=true showExcptionUrl=http://erp.hive.jyymatrix.cc/showException #异常上报地址 exception_center_url =http://geek.xc.jyymatrix.cc/addException #项目编号 projNo=78 #项目负责人 owner=姜友瑶 #日志文件清理阈值 单位:MB log_max=20 #日志清理天数 log_clear_day=5 wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code xcx_appid =wx3836ab3c1490ff29 xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47 xcx_manager_appid=wx2948b3b914a9722e xcx_manager_secret=1685dfd99a43e213ed8be07870b898ba #微信支付调试开关 wx_pay_debug_onoff = false @@ -146,12 +26,6 @@ #快递鸟接口指令 logistics.requestType=1002 #丰桥顾客编码 sf.logistics.clientCode=XCZHYF #丰桥校验码 sf.logistics.checkword=zqcjA2A5m6MIGa6mImMcnpKQ9ipYlbUW #丰桥接口地址 sf.logistics.url=https://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService #发送短信配置 crm.request_url = http://192.168.1.248 @@ -161,20 +35,34 @@ sms.login_accountNe = N4617160 sms.login_passwordNe = rb1cxLitRB83e0 #接入统一登录平台配置 platform_app_code = wx_shop platform_secret_key = b21e309f07964e4fae5b156d74b5d66z #platform_verity_url = http://localhost:8080/platform/getUserInfo platform_verity_url = http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo #微信支付回调地址 pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png #hive仓库地址 hive.service=http://erp.hive.jyymatrix.cc/meidu-crm/ #是否启用异常上报 is_open_exception_report=true showExcptionUrl=http://hive.mydoline.com/showException #百度编辑器,覆盖默认配置 ueditor.imageUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile ueditor.imagePathFormat=/image/{yyyy}{mm}{dd}/{time}{rand:6} ueditor.scrawlPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6} ueditor.scrawlUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile ueditor.snapscreenPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6} ueditor.snapscreenUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile ueditor.catcherPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6} ueditor.catcherUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile ueditor.videoPathFormat=/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6} ueditor.videoUrlPrefix=http://127.0.0.1:1088/uploadeFile/ ueditor.filePathFormat=/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6} ueditor.fileUrlPrefix=http://127.0.0.1:1088/uploadeFile/ ueditor.imageManagerListPath=http://127.0.0.1:1088/uploadeFile/ ueditor.fileManagerListPath=http://127.0.0.1:1088/uploadeFile/ zq-erp/src/main/resources/config/application-taiyan.properties
@@ -1,137 +1,19 @@ evn=prd server.port=8080 #数据库链接 spring.datasource.username=hive spring.datasource.password=hive123!@# spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.initialSize=3 spring.datasource.minIdle=3 spring.datasource.maxActive=20 spring.datasource.maxWait=60000 spring.datasource.timeBetweenEvictionRunsMillis=60000 spring.datasource.minEvictableIdleTimeMillis=300000 spring.datasource.validationQuery=SELECT 1 FROM DUAL spring.datasource.testWhileIdle=true spring.datasource.testOnBorrow=true spring.datasource.testOnReturn=true spring.datasource.filters=stat,wall,log4j spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 spring.thymeleaf.prefix: classpath:/templates/views/ spring.thymeleaf.cache=false mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml #设置全局时间返回格式 第三行设置为true表示返回时间戳 #spring.jackson.date-format=yyyy-MM-dd #spring.jackson.time-zone=GMT+8 #spring.jackson.serialization.write-dates-as-timestamps=true #文件上传时的大小限制 单位M spring.servlet.multipart.max-file-size=300MB spring.servlet.multipart.max-request-size=300MB #-------------------------------------- #rabbitMQ配置 rabbitmq.host=47.111.134.136 rabbitmq.port=5672 rabbitmq.username=hivequeue rabbitmq.password=hivequeueadmin useRabbit=true #指定消费者确认方式 当为manual时手动确认 不配置表示自动确认 #spring.rabbitmq.listener.simple.acknowledge-mode=manual server.session.timeout=120 ali.sms.accessKeyId=LTAI4FrjY9R9iDfC6YQTHfne ali.sms.accessKeySecret=eSvQslpHpDSGlI9Hxm4y5MynNgLbCp ali.sms.regionId=cn-hangzhou ali.sms.signName=\u80bd\u598d #hour activities.groupBuy.limit=24 #minute groupBuy.pay.timeLimit=30 #定时任务 scheduling.enabled=true swagger.enable=false #默认头像 default.vip.photo.woman=https://filehive2.jyymatrix.cc/uploadeFile/20210125/db53552e688040afb286686f081e1e68f3fe946f75624598828f01898635152e.png default.vip.photo.man=https://filehive2.jyymatrix.cc/uploadeFile/20210125/3642f1d827c44c76832fea106c85e0f89e089c16cbcc4dd0a82bb52b9ac700f4.png #是否启用debug模式 debug=false # 日志文件保存地址 log_path=/mnt/hive/log # 系统语言环境 zh中文,us英文 system_language=zh # 错误密码允许输入的次数,大于五次后账号锁定,0表示不锁账号 error_password_times=5 # 默认密码 default_password=123 #nginx静态资源访问地址 static_resource_url=https://filehive2.jyymatrix.cc/uploadeFile/ #文件保存地址 file_storage_path=/mnt/hive/static/uploadeFile/ #文件上传大小字节为单位 10MB maxUploadSize=10485760 #Matser\u7684ip\u5730\u5740 redis.hostname=120.27.238.55 #\u7AEF\u53E3\u53F7 redis.port=6379 #\u5982\u679C\u6709\u5BC6\u7801 redis.password=xcong123 #\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000 redis.timeout=10000 redis.database=1 redis_time_out=1800000 cookie_time_out=36000 #APP登录公钥 login_public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB #APP登录秘钥 login_private_key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJa8rpRYK1Kn/yqdOrJR87TBuDgK7E57sh6INICYBN8edaoE+dtnvepDgD3S8ajAHuanleeYG+BPB9e0OHTzJ3hu2UfBIPdKFtHIZ8Z9XyVzjtlMuIkfTG643aId+d+PzNDmRyqKN6i2CCjasXxS7spJHcfFXI32Y7bYLqnWvnBVAgMBAAECgYBNzQFGq+NgfDllo1WCaG4jI8GTm3+wWoPq4l5G6S/KgYw1vu+/YOJTIZf1UQVOFitc3a6vpIDu25uup+Rj6IS8B4V8NDfc8P+iMNwdIKqqBj8wHu0/SaxYdW1uqlU5+XkJMxsNMgNRRGPSIQhla5OPHtBzIa7t4lmypETMZtXEmQJBAMsa1OIQzAKU05GweCnNNSoqo/nAQLqp8zfbJypxRx24uaCyS7C+KxN+O4FyaYmM9n0X+cgkr+RYHAIa7mg3gccCQQC9/nJvRBum8+4TINnz6QrvTmTlhi8QKW/CiRYpGgmo5PtQYw4BkRQbYO8ktFDM2yeO75XBv09qnGQaivDCeL0DAkEAisFg8LSy+4x7YcvivAQirxUEg2qRjjTvIZjKEBflkuuRfbRxO2Uf/qg9tPjaGwu/lcScc9yEggaj09hcSbyqHwJAN8QLiqUPCL3oTy0BTBpG316/Nq9f+Ppwl0TtgDroQu6S5VFttwACStb02m0imj5pKgcgibHBeaVVrITDjhEqSQJAaCHD/ytTzgtgLoVVyZZxOB272W7PI3mnzL8qQSldx1/QOBs1NmmEZuo7ELFMrfTmlxa1qR4gsq/ImfIdUdXewQ== #是否启用异常上报 is_open_exception_report=true showExcptionUrl=http://erp.hive.jyymatrix.cc/showException #异常上报地址 exception_center_url =http://geek.xc.jyymatrix.cc/addException #项目编号 projNo=78 #项目负责人 owner=姜友瑶 #日志文件清理阈值 单位:MB log_max=20 #日志清理天数 log_clear_day=5 wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code xcx_appid =wx3836ab3c1490ff29 xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47 xcx_manager_appid=wx2948b3b914a9722e xcx_manager_secret=1685dfd99a43e213ed8be07870b898ba #微信支付调试开关 wx_pay_debug_onoff = false @@ -144,12 +26,6 @@ #快递鸟接口指令 logistics.requestType=1002 #丰桥顾客编码 sf.logistics.clientCode=XCZHYF #丰桥校验码 sf.logistics.checkword=zqcjA2A5m6MIGa6mImMcnpKQ9ipYlbUW #丰桥接口地址 sf.logistics.url=https://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService #发送短信配置 crm.request_url = http://192.168.1.248 @@ -159,18 +35,35 @@ sms.login_accountNe = N4617160 sms.login_passwordNe = rb1cxLitRB83e0 #接入统一登录平台配置 platform_app_code = wx_shop platform_secret_key = b21e309f07964e4fae5b156d74b5d66z #platform_verity_url = http://localhost:8080/platform/getUserInfo platform_verity_url = http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo #微信支付回调地址 pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png #hive仓库地址 hive.service=http://erp.hive.jyymatrix.cc/meidu-crm/ #是否启用异常上报 is_open_exception_report=true showExcptionUrl=http://erp.hive.jyymatrix.cc/ #百度编辑器,覆盖默认配置 ueditor.imageUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile ueditor.imagePathFormat=/image/{yyyy}{mm}{dd}/{time}{rand:6} ueditor.scrawlPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6} ueditor.scrawlUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile ueditor.snapscreenPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6} ueditor.snapscreenUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile ueditor.catcherPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6} ueditor.catcherUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile ueditor.videoPathFormat=/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6} ueditor.videoUrlPrefix=http://127.0.0.1:1088/uploadeFile/ ueditor.filePathFormat=/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6} ueditor.fileUrlPrefix=http://127.0.0.1:1088/uploadeFile/ ueditor.imageManagerListPath=http://127.0.0.1:1088/uploadeFile/ ueditor.fileManagerListPath=http://127.0.0.1:1088/uploadeFile/ zq-erp/src/main/resources/config/application-test.properties
@@ -1,4 +1,3 @@ #数据库链接 spring.datasource.username=ct_test spring.datasource.password=123456 zq-erp/src/main/resources/config/application.properties
@@ -1,5 +1,5 @@ spring.profiles.active=local spring.profiles.active=taiyan evn=dev server.port=8080 @@ -109,18 +109,14 @@ #微信支付回调地址 pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png #hive仓库地址 hive.service=http://localhost:8082/meidu-crm/ #是否启用异常上报 is_open_exception_report=false showExcptionUrl=http://test.hive.jyymatrix.cc/showException #APP登录公钥 login_public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB #APP登录秘钥 login_private_key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJa8rpRYK1Kn/yqdOrJR87TBuDgK7E57sh6INICYBN8edaoE+dtnvepDgD3S8ajAHuanleeYG+BPB9e0OHTzJ3hu2UfBIPdKFtHIZ8Z9XyVzjtlMuIkfTG643aId+d+PzNDmRyqKN6i2CCjasXxS7spJHcfFXI32Y7bYLqnWvnBVAgMBAAECgYBNzQFGq+NgfDllo1WCaG4jI8GTm3+wWoPq4l5G6S/KgYw1vu+/YOJTIZf1UQVOFitc3a6vpIDu25uup+Rj6IS8B4V8NDfc8P+iMNwdIKqqBj8wHu0/SaxYdW1uqlU5+XkJMxsNMgNRRGPSIQhla5OPHtBzIa7t4lmypETMZtXEmQJBAMsa1OIQzAKU05GweCnNNSoqo/nAQLqp8zfbJypxRx24uaCyS7C+KxN+O4FyaYmM9n0X+cgkr+RYHAIa7mg3gccCQQC9/nJvRBum8+4TINnz6QrvTmTlhi8QKW/CiRYpGgmo5PtQYw4BkRQbYO8ktFDM2yeO75XBv09qnGQaivDCeL0DAkEAisFg8LSy+4x7YcvivAQirxUEg2qRjjTvIZjKEBflkuuRfbRxO2Uf/qg9tPjaGwu/lcScc9yEggaj09hcSbyqHwJAN8QLiqUPCL3oTy0BTBpG316/Nq9f+Ppwl0TtgDroQu6S5VFttwACStb02m0imj5pKgcgibHBeaVVrITDjhEqSQJAaCHD/ytTzgtgLoVVyZZxOB272W7PI3mnzL8qQSldx1/QOBs1NmmEZuo7ELFMrfTmlxa1qR4gsq/ImfIdUdXewQ==