Merge branch 'develop' into registry-nacos

sop-admin/sop-admin-server/src/main/resources/application-dev.properties

@@ -0,0 +1,53 @@
+server.port=8082
+spring.application.name=sop-admin
+
+# ------- 需要改的配置 -------
+# mysql数据库账号
+mysql.username=root
+mysql.password=root
+
+# eureka注册中心地址
+eureka.url=http://localhost:1111/eureka/
+# nacos注册中心地址
+nacos.url=127.0.0.1:8848
+# zookeeper地址
+zookeeper.url=localhost:2181
+# zipkin服务监控地址，没有开启不用改
+zipkin.url=http://127.0.0.1:9411/
+# ------- 需要改的配置end -------
+
+######### 下面的配置基本不用改 #########
+
+# token过期时间，分钟
+admin.access-token.timeout-minutes=30
+# 签名方式，rsa：支付宝开放平台签名方式，md5：淘宝开放平台签名方式
+sop.sign-type=rsa
+
+# zookeeper配置
+spring.cloud.zookeeper.connect-string=${zookeeper.url}
+spring.cloud.zookeeper.baseSleepTimeMs=3000
+spring.cloud.zookeeper.maxRetries=3
+
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.url=jdbc:mysql://localhost:3306/sop?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
+spring.datasource.username=${mysql.username}
+spring.datasource.password=${mysql.password}
+
+# 固定不用改
+easyopen.show-doc=false
+easyopen.ignore-validate=true
+
+# 注册中心地址，根据实际情况改，这里只是参数，并不会去注册
+registry.eureka-server-addr=${eureka.url}
+registry.nacos-server-addr=${nacos.url}
+# 使用eureka，填：eureka，使用nacos填：nacos
+registry.name=eureka
+
+logging.level.com.gitee=debug
+
+# 不用改
+mybatis.fill.com.gitee.fastmybatis.core.support.DateFillInsert=gmt_create
+mybatis.fill.com.gitee.fastmybatis.core.support.DateFillUpdate=gmt_modified
+
+# 不用改，如果要改，请全局替换修改
+zuul.secret=MZZOUSTua6LzApIWXCwEgbBmxSzpzC

sop-admin/sop-admin-server/src/main/resources/application.properties

@@ -0,0 +1 @@
+spring.profiles.active=dev