From aeed4eb8427c32d807288127b75f42ef66a95666 Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Wed, 10 May 2023 15:27:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bim/controller/ProjectBimController.java | 28 +-- src/main/resources/application.properties | 160 +++++++++--------- 2 files changed, 94 insertions(+), 94 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/bim/controller/ProjectBimController.java b/src/main/java/com/zhgd/xmgl/modules/bim/controller/ProjectBimController.java index a2f4b3639..52ffa8ed4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bim/controller/ProjectBimController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bim/controller/ProjectBimController.java @@ -38,8 +38,8 @@ import java.util.Map; public class ProjectBimController { @Autowired private IProjectBimService projectBimService; - - /** + + /** * 分页列表查询 * @return @@ -60,8 +60,8 @@ public class ProjectBimController { result.setResult(pageList); return result; } - - /** + + /** * 添加 * @param projectBim * @rurn @@ -129,15 +129,15 @@ public class ProjectBimController { result.successMsg(MessageUtil.get("editSucess")); } } - + return result; } - - /** - * 通过id删除 - * @param - * @return - */ + + /** + * 通过id删除 + * @param + * @return + */ @OperLog(operModul = "BIM管理",operType = "删除bim模型",operDesc = "删除bim模型") @ApiOperation(value = "删除bim模型信息", notes = "删除bim模型信息" , httpMethod="POST") @ApiImplicitParam(name = "id", value = "bim模型ID", paramType = "query", required = true, dataType = "Integer") @@ -153,7 +153,7 @@ public class ProjectBimController { result.successMsg(MessageUtil.get("deleteSucess")); } } - + return result; } @@ -169,8 +169,8 @@ public class ProjectBimController { return Result.ok(); } - - /** + + /** * 通过id查询 * @param * @return diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f3e01fd45..9b201b512 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,4 @@ -# \u73AF\u5883\u9009\u62E9 +# 环境选择 spring.profiles.active=zjsj-gsx #spring.profiles.active=dev6024 #spring.profiles.active=dev6025 @@ -21,94 +21,94 @@ spring.profiles.active=zjsj-gsx #spring.profiles.active=zjyj #spring.profiles.active=hqhf #spring.profiles.active=prod -# \u56FD\u9645\u5316\u914D\u7F6E +# 国际化配置 spring.messages.basename=i18n/messages spring.messages.encoding=utf-8 -# \u540E\u53D1\u73B0\u7684bean\u4F1A\u8986\u76D6\u4E4B\u524D\u76F8\u540C\u540D\u79F0\u7684bean +# 后发现的bean会覆盖之前相同名称的bean spring.main.allow-bean-definition-overriding=true -# \u6570\u636E\u5E93\u9A71\u52A8\u7C7B -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -# \u6570\u636E\u5E93\u8FDE\u63A5\u6C60\u914D\u7F6E -spring.datasource.type=com.zaxxer.hikari.HikariDataSource +# 数据库驱动类 +spring.datasource.driver-class-name=com.mysql.jdbc.driver +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.driver +# 数据库连接池配置 +spring.datasource.type=com.zaxxer.hikari.hikaridatasource spring.datasource.hikari.minimum-idle=20 spring.datasource.hikari.maximum-pool-size=500 spring.datasource.hikari.auto-commit=true spring.datasource.hikari.idle-timeout=40000 -spring.datasource.hikari.pool-name=DatebookHikariCP +spring.datasource.hikari.pool-name=datebookhikaricp spring.datasource.hikari.max-lifetime=1800000 spring.datasource.hikari.validation-timeout=3000 #(wait_timeout-30)*1000 spring.datasource.hikari.connection-timeout=50000 -spring.datasource.hikari.connection-test-query=SELECT 1 -# \u6570\u636E\u5E93\u52A0\u5BC6\u7B7E\u540D -jasypt.encryptor.password=JXJZHGDPT -# \u5982\u679C\u67E5\u8BE2\u7ED3\u679C\u4E2D\u5305\u542B\u7A7A\u503C\u7684\u5217\uFF0C\u5219 MyBatis \u5728\u6620\u5C04\u7684\u65F6\u5019\uFF0C\u4F1A\u4E0D\u4F1A\u6620\u5C04\u8FD9\u4E2A\u5B57\u6BB5 +spring.datasource.hikari.connection-test-query=select 1 +# 数据库加密签名 +jasypt.encryptor.password=jxjzhgdpt +# 如果查询结果中包含空值的列，则 mybatis 在映射的时候，会不会映射这个字段 mybatis-plus.configuration.call-setters-on-nulls=true -# \u5E8F\u5217\u5316\u914D\u7F6E -spring.jackson.defaultPropertyInclusion=ALWAYS -# mybatis \u914D\u7F6E +# 序列化配置 +spring.jackson.defaultpropertyinclusion=always +# mybatis 配置 mybatis-plus.mapper-locations=classpath*:com/zhgd/xmgl/**/*.xml,classpath*:com/zhwl/zw/**/*.xml -mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl +mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.stdoutimpl # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) #mybatis-plus.global-config.db-config.logic-delete-field=flag mybatis-plus.global-config.db-config.logic-delete-value=1 mybatis-plus.global-config.db-config.logic-not-delete-value=0 -# mvc \u89C6\u56FE\u5BF9\u8C61\u914D\u7F6E +# mvc 视图对象配置 spring.mvc.view.prefix=/ spring.mvc.view.suffix=.html spring.mvc.dispatch-options-request=true -# jwt\u7B7E\u540D +# jwt签名 security.jwt.token.secret-key=zhgd -# \u6587\u4EF6\u4E0A\u4F20\u914D\u7F6E +# 文件上传配置 spring.servlet.multipart.enabled=true spring.servlet.multipart.file-size-threshold=0 -spring.servlet.multipart.max-file-size=1024MB -spring.servlet.multipart.max-request-size=1024MB +spring.servlet.multipart.max-file-size=1024mb +spring.servlet.multipart.max-request-size=1024mb spring.servlet.multipart.resolve-lazily=false -# mqtt\u670D\u52A1\u5668\u914D\u7F6E +# mqtt服务器配置 mqtt.username=admin mqtt.password=public #mqtt.url=tcp://139.159.226.224:1883 #mqtt.url=ws://139.159.226.224:8083/mqtt mqtt.url=tcp://182.90.224.147:1883 -# \u6D88\u8D39\u8005\u548C\u63D0\u4F9B\u8005\u5BF9\u5E94\u7684\u5BA2\u6237\u7AEFid\u4EE5\u53CA\u9ED8\u8BA4topic -mqtt.producer.clientId=mqttProd -mqtt.producer.defaultTopic=topic1 -mqtt.consumer.clientId=mqttConsumer -mqtt.consumer.defaultTopic=topic1 -#mqtt.consumer.defaultTopic=/P114101/202203010084 +# 消费者和提供者对应的客户端id以及默认topic +mqtt.producer.clientid=mqttprod +mqtt.producer.defaulttopic=topic1 +mqtt.consumer.clientid=mqttconsumer +mqtt.consumer.defaulttopic=topic1 +#mqtt.consumer.defaulttopic=/p114101/202203010084 #server.http2.enabled=true server.ssl.key-store=classpath:www.cscec1b1.com.jks -server.ssl.key-store-password=Un8&yP!o^Nyd*gm# -server.ssl.key-store-type=JKS +server.ssl.key-store-password=un8&yp!o^nyd*gm# +server.ssl.key-store-type=jks server.ssl.enabled=true image.visit.url= -# \u534E\u4E3A\u4E91\u914D\u7F6E +# 华为云配置 hw-ocr-username=szjxjzh hw-ocr-password=jxj27696951 hw-ocr-domainname=szjxjzh hw-ocr-projectid=0633b705cc000f3e2f55c010af021eec hw-ocr-endpoint=cn-east-3 hw-ocr-enable=false -# \u8679\u8F6F\u914D\u7F6E -arcsoft.appId=4F9jmKsCYKsQskYBTXK7sQZLH8dFdT7LK5Yjx5XA8gkB -arcsoft.sdkKey=FUPhPPfPXrAmFrecmCSiG5BjmHSwp86QogvdCM7g8B5k -arcsoft.linux.sdkKey=FUPhPPfPXrAmFrecmCSiG5BjdAskGRSejyGzUuVj4F6V -arcsoft.ufaceSorce=80 -# \u6388\u6743\u6821\u9A8C -checkAuthEnable=false -# \u534E\u4E3A\u4E91\u77ED\u4FE1\u670D\u52A1\u914D\u7F6E -sms.hw.appKey=JxU82mBx1x4l4RC78ynN1D9Q3neI -sms.hw.appSecret=c9wi20z1z5N1YZ2T6UH2BJuTUAF4 +# 虹软配置 +arcsoft.appid=4f9jmkscyksqskybtxk7sqzlh8dfdt7lk5yjx5xa8gkb +arcsoft.sdkkey=fuphppfpxramfrecmcsig5bjmhswp86qogvdcm7g8b5k +arcsoft.linux.sdkkey=fuphppfpxramfrecmcsig5bjdaskgrsejygzuuvj4f6v +arcsoft.ufacesorce=80 +# 授权校验 +checkauthenable=false +# 华为云短信服务配置 +sms.hw.appkey=jxu82mbx1x4l4rc78ynn1d9q3nei +sms.hw.appsecret=c9wi20z1z5n1yz2t6uh2bjutuaf4 sms.hw.verify.signchannel=88200413256 -sms.hw.verify.verifyCode=f273233ff3224adbbbc85cd53d58fc50 +sms.hw.verify.verifycode=f273233ff3224adbbbc85cd53d58fc50 sms.hw.notice.signchannel=8821051731025 -sms.hw.notice.templateId.standardAlarm=790d907f70594b4893227fc1d97e78bc -sms.hw.notice.templateId.standardDevState=10930770f5954d12881143e548f8483b -sms.hw.notice.templateId.carPass= +sms.hw.notice.templateid.standardalarm=790d907f70594b4893227fc1d97e78bc +sms.hw.notice.templateid.standarddevstate=10930770f5954d12881143e548f8483b +sms.hw.notice.templateid.carpass= swagger.enable=true -# redis\u96C6\u7FA4 +# redis集群 #spring.redis.database=0 #spring.redis.cluster.nodes=127.0.0.1:6379,192.168.40.156:6380 #spring.redis.cluster.max-redirects=3 @@ -117,56 +117,56 @@ swagger.enable=true #spring.redis.lettuce.pool.max-wait=60s #spring.redis.lettuce.pool.max-idle=10 #spring.redis.lettuce.pool.min-idle=5 -#\u4E2A\u63A8\u914D\u7F6E -getui.baseUrl=https://restapi.getui.com/v2/ -# \u65B0\u914D\u7F6E -getui.appId=vTqRdzRpeI8SnXKDawStZ3 -getui.appKey=wlPjAki13R8STuofcjnXM1 -getui.appSecret=Wy3FFyaXzb9MUl94FMrLo1 -getui.masterSecret=zZ5bMTOjUe5v3MFhm8gLL -#\u5224\u65AD\u8003\u52E4\u56DE\u8C03\u662F\u5426\u9700\u8981\u56FE\u7247,1\u662F -# \u4EBA\u5458\u8003\u52E4\u56FE\u7247\u7C7B\u578B 1\uFF1Abase64 -imageType=1 -# jxj\u8BBE\u5907\u56FE\u7247\u7C7B\u578B +#个推配置 +getui.baseurl=https://restapi.getui.com/v2/ +# 新配置 +getui.appid=vtqrdzrpei8snxkdawstz3 +getui.appkey=wlpjaki13r8stuofcjnxm1 +getui.appsecret=wy3ffyaxzb9mul94fmrlo1 +getui.mastersecret=zz5bmtojue5v3mfhm8gll +#判断考勤回调是否需要图片,1是 +# 人员考勤图片类型 1：base64 +imagetype=1 +# jxj设备图片类型 jxj.dev.image.type=1 -pdf.watermark=\u5B9E\u540D\u5236 -# bimface\u8BF7\u6C42URL -bim.getTokenURL=https://api.bimface.com/oauth2/token -bim.deleteFileURL=https://file.bimface.com/file?fileId=%s -bim.uploadURL=https://file.bimface.com/upload?name=%s&url=%s -# redis \u5355\u4F53\u914D\u7F6E +pdf.watermark=实名制 +# bimface请求url +bim.gettokenurl=https://api.bimface.com/oauth2/token +bim.deletefileurl=https://file.bimface.com/file?fileid=%s +bim.uploadurl=https://file.bimface.com/upload?name=%s&url=%s +# redis 单体配置 spring.redis.database=1 spring.redis.host=127.0.0.1 spring.redis.port=6379 -#spring.redis.password=JXJ@admin +#spring.redis.password=jxj@admin spring.redis.password= spring.redis.timeout=2000s spring.redis.lettuce.pool.max-active=8 spring.redis.lettuce.pool.max-wait=60s spring.redis.lettuce.pool.max-idle=10 spring.redis.lettuce.pool.min-idle=10 -# spring boot admin \u6240\u5728\u670D\u52A1\u5668 +# spring boot admin 所在服务器 spring.boot.admin.client.url=http://localhost:9091 -# actuator \u914D\u7F6E\u5185\u5BB9 +# actuator 配置内容 management.endpoints.web.exposure.include=* management.endpoints.enabled-by-default=true management.endpoints.web.base-path=/actuator management.endpoint.health.show-details=always management.endpoint.logfile.external-file=logs/logs/zhgd-all.log -# \u643A\u7A33\u7535\u7BB1\u83B7\u53D6\u6700\u540E\u4E00\u6761\u6570\u636E -xiwon.postElectricRealTimeData=http://openapi.xiwon588.com/electric/realTimeData -# \u643A\u7A33\u5BC6\u94A5 -#xiwon.appId=1638947489842 -#xiwon.appSecret=36e0a5cf-02e6-421b-bf92-3b1ace11e1a2 -# \u6B63\u5F0F -xiwon.appId=1672383573694 -xiwon.appSecret=5dfe1664-51fd-40af-8fbb-a15bbcaae1d1 -# \u5149\u4F0F\u53D1\u7535\u5BA2\u6237\u4FE1\u606F -koyoe.clientId=btxny +# 携稳电箱获取最后一条数据 +xiwon.postelectricrealtimedata=http://openapi.xiwon588.com/electric/realtimedata +# 携稳密钥 +#xiwon.appid=1638947489842 +#xiwon.appsecret=36e0a5cf-02e6-421b-bf92-3b1ace11e1a2 +# 正式 +xiwon.appid=1672383573694 +xiwon.appsecret=5dfe1664-51fd-40af-8fbb-a15bbcaae1d1 +# 光伏发电客户信息 +koyoe.clientid=btxny koyoe.secret=akdu5sar7w -# \u5149\u4F0F\u53D1\u7535\u8BF7\u6C42\u5730\u5740 +# 光伏发电请求地址 koyoe.base-url=https://solar.koyoe.com koyoe.get-token=${koyoe.base-url}/third-party/api/token?grant_type=client_credentials -koyoe.nowData=${koyoe.base-url}/third-party/api/nowData?sn=%s -# \u662F\u5426\u8BC1\u4E66\u9A8C\u8BC1 +koyoe.nowdata=${koyoe.base-url}/third-party/api/nowdata?sn=%s +# 是否证书验证 is-license=false