fix(mysql): mysql服务更新

.gitignore

@@ -6,3 +6,5 @@ logs/
 *.iws
 ai.md
 Makefile
+.DS_Store
+.trae

src/main/resources/application-dev.properties

@@ -3,8 +3,8 @@ spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 #spring.datasource.username=geexek
 #spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://47.111.166.211:3306/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.password=mysql_master_geexek_408
-spring.datasource.username=mysql_master
+spring.datasource.password=8N8F0cWb7rg88FWW
+spring.datasource.username=geexek_mysql
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.url=jdbc:mysql://rm-bp1xezgtx890ssl6rto.mysql.rds.aliyuncs.com:3306/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&&useSSL=false
 

src/main/resources/application-ggb.properties

+http://localhost:9090/gk/service/index/25349?uId=1430673&cId=25349&timestamp=1719905494&sign=340fab76ed357211bec8507b66af9db0
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+#spring.datasource.password=geexekNewPass4!
+#spring.datasource.username=geexek
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://47.111.166.211:3306/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+spring.datasource.password=8N8F0cWb7rg88FWW
+spring.datasource.username=geexek_mysql
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.url=jdbc:mysql://rm-bp1xezgtx890ssl6rto.mysql.rds.aliyuncs.com:3306/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&&useSSL=false
+
+mybatis.typeAliasesPackage=com.dlbridge.jadp.plugins
+mybatis.mapperLocations=classpath:com/dlbridge/jadp/plugins/**/**.xml
+mybatis.configuration.map-underscore-to-camel-case=true
+mybatis.configuration.jdbc-type-for-null=null
+spring.profiles.active=dev
+server.port=9090
+charset_name=UTF-8
+#\u8BBE\u7F6E\u73AF\u5883\u914D\u7F6E
+#spring.profiles.active=dev
+#http encoding
+spring.http.encoding.charset=UTF-8
+spring.http.encoding.enabled=true
+spring.http.encoding.force=true
+logging.file=./logs/gksite.log
+logging.file.max-size=10MB
+#\u5173\u95ED\u542F\u52A8Logo
+spring.main.banner-mode=off
+#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
+productName=jBridge\u5feb\u901f\u5f00\u53d1\u5e73\u53f0
+#\u8BBE\u7F6Emvc\u9875\u9762\u8DF3\u8F6C
+spring.mvc.view.prefix=/WEB-INF/views/
+spring.mvc.view.suffix=.jsp
+spring.freemarker.template-loader-path=classpath:/templates
+spring.resources.static-locations=/static/
+spring.mvc.static-path-pattern=/**
+spring.resources.cache.cachecontrol.no-cache=true
+spring.resources.cache.period=0
+spring.resources.chain.cache=false
+##scheduler
+spring.task.scheduler.pool=10
+spring.task.thread=spring-task-thread
+#\u542F\u52A8\u62A5\u9519class path resource [processes/] cannot be resolved to URL because it does not exist
+spring.activiti.check-process-definitions=false
+#\u5206\u9875\u914d\u7f6e
+page.pageSize=30
+#pagehelper\u5206\u9875\u63D2\u4EF6\u914D\u7F6E
+pagehelper.helperDialect=mysql
+pagehelper.reasonable=true
+pagehelper.supportMethodsArguments=true
+pagehelper.params=count=countSql
+spring.data.web.pageable.default-page-size=10
+spring.data.web.pageable.max-page-size=100
+weixin.micro.appid=wx96ce27826f39cdb3
+weixin.micro.secret=11bfc4902e7c992b57a2cdcfeded623f
+geexek.user.url=https://www.geexek.com/
+geexek.cmpt.url=https://timerbackend.geexek.com/
+
+geexek.shamus.url=http://shamus.geexek.com/
+timer.url=http://timer.geexek.com/
+server.url=http://zs.geexek.com/
+server.url.https=http://localhost:9090/
+###redis
+spring.redis.port=6379
+spring.redis.host=localhost
+spring.redis.jedis.pool.min-idle=10
+spring.redis.jedis.pool.max-idle=10
+spring.redis.jedis.pool.max-active=10
+spring.servlet.multipart.max-file-size=10Mb
+spring.servlet.multipart.enabled=true
+spring.servlet.multipart.max-request-size=50Mb
+spring.application.name=micro-gksite
+
+management.endpoints.web.exposure.include=*
+
+#feign调用连接超时时间
+feign.client.config.default.connect-timeout=30000
+#feign调用读取超时时间
+feign.client.config.default.readTimeout=30000
+#feign调用的log 等级
+feign.client.config.default.loggerLevel=full
+feign.okhttp.enabled=true
+#feign.hystrix.enabled=true
+feign.sentinel.enabled=true
+
+
+hystrix.metrics.enabled=true
+hystrix.command.default.execution.timeout.enabled=false
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000
+logging.level.com.dlbridge.feign.NewsService=debug
+logging.level.org.springframework.cloud.openfeign=debug
+spring.zipkin.base-url=http://zipkin.geexek.com.cn
+spring.zipkin.sender.type=web
+spring.sleuth.sampler.probability=1
+swagger.enable=true
+
+#spring.cloud.sentinel.servlet.blockPage=test
+
+spring.cloud.sentinel.transport.dashboard=http://localhost:9948
+spring.cloud.sentinel.transport.port=8719
+spring.cloud.sentinel.eager=true
+spring.cloud.sentinel.filter.enabled=false
+spring.cloud.sentinel.skip-keys=cmptId
+spring.cloud.sentinel.exclude-urls=/static/**,**.css,**.js
+
+## nacos 地址
+spring.cloud.sentinel.datasource.ds.nacos.server-addr=http://127.0.0.1:8848
+spring.cloud.sentinel.datasource.ds.nacos.dataId=micro-gksite-sentinel
+spring.cloud.sentinel.datasource.ds.nacos.data-type=json
+spring.cloud.sentinel.datasource.ds.nacos.groupId=production
+#spring.cloud.sentinel.datasource.ds1.nacos.namespace=fad8a39-a3e7-49a1-ae96-0f7aaf39136b
+#
+## 规则类型
+spring.cloud.sentinel.datasource.ds.nacos.rule-type=flow
+
+
+base.url=http://localhost:8080
+
+lock.url=https://openapi.qiyuesuo.cn
+lock.accessKey=trRQR9ewQX
+lock.accessSecret=W6PysadsbPppDfts18ukZBUJ2GPkQZ
+lock.categoryId=2816977402314363323
+lock.companyReceiver=18201908070
+
+upload.rmi=rmi://172.16.214.236:9125/RMIUpload

src/main/resources/application-production.properties

 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.password=mysql_master_geexek_408
-spring.datasource.username=mysql_master
+spring.datasource.password=8N8F0cWb7rg88FWW
+spring.datasource.username=geexek_mysql
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.url=jdbc:mysql://rm-bp1xezgtx890ssl6r.mysql.rds.aliyuncs.com:3306/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
 
@@ -60,9 +60,9 @@ spring.redis.jedis.pool.min-idle=20
 # ?????????????????????
 spring.redis.jedis.pool.max-wait=2000ms
 
-spring.servlet.multipart.max-file-size=30Mb
+spring.servlet.multipart.max-file-size=100Mb
 spring.servlet.multipart.enabled=true
-spring.servlet.multipart.max-request-size=50Mb
+spring.servlet.multipart.max-request-size=100Mb
 spring.application.name=micro-gksite
 ribbon.eureka.enable=true
 #feign调用连接超时时间
@@ -104,7 +104,7 @@ spring.cloud.sentinel.skip-keys=cmptId
 spring.cloud.sentinel.exclude-urls=/static/**,**.css,**.js
 
 ## nacos 地址
-spring.cloud.sentinel.datasource.ds.nacos.server-addr=https://nacos.geexek.com
+spring.cloud.sentinel.datasource.ds.nacos.server-addr=http://192.168.214.230:9848
 spring.cloud.sentinel.datasource.ds.nacos.dataId=micro-gksite-sentinel
 spring.cloud.sentinel.datasource.ds.nacos.data-type=json
 spring.cloud.sentinel.datasource.ds.nacos.groupId=production

src/main/webapp/WEB-INF/views/cmpt/gpsDeposit.jsp

@@ -605,7 +605,7 @@
                                                                 }
                                                             }, '部分退款'),
                                                             // 仅当订单状态为待支付时，显示删除按钮
-                                                            row.tradeStatus === TradeStatusEnum.WAIT_PAY.value && h(NButton, {
+                                                            h(NButton, {
                                                                 type: 'error',
                                                                 size: 'small',
                                                                 onClick: async () => {
@@ -618,7 +618,7 @@
                                                                 }
                                                             }, '删除订单'),
                                                             // 编辑订单
-                                                            [TradeStatusEnum.WAIT_PAY.value, TradeStatusEnum.PAY_SUCCESS.value].includes(row.tradeStatus) && h(NButton, {
+                                                            [TradeStatusEnum.WAIT_PAY.value, TradeStatusEnum.PAY_SUCCESS.value, TradeStatusEnum.PAY_SUCCESS.value].includes(row.tradeStatus) && h(NButton, {
                                                                 type: 'primary',
                                                                 size: 'small',
                                                                 onClick: () => {