Merge remote-tracking branch 'origin/master'

src/main/java/com/gxwebsoft/common/system/entity/Organization.java

@@ -95,6 +95,9 @@ public class Organization implements Serializable {
     @ApiModelProperty(value = "是否合作单位")
     private Integer isCoop;
 
+    @ApiModelProperty(value = "是否办公室主任")
+    private Integer isChief;
+
     @ApiModelProperty(value = "法定代表人")
     private String legalPerson;
 

src/main/resources/application-tyzx.yml

@@ -0,0 +1,42 @@
+# 生产环境配置
+
+# 数据源配置
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3308/gxwebsoft_core?useSSL=false&serverTimezone=UTC
+    username: gxwebsoft_core
+    password: jdj7HYEdYHnYEFBy
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+
+# 日志配置
+logging:
+  file:
+    name: websoft-core.log
+  level:
+    root: WARN
+    com.gxwebsoft: ERROR
+    com.baomidou.mybatisplus: ERROR
+
+socketio:
+  host: 0.0.0.0 #IP地址
+
+knife4j:
+  # 开启knife4j增强
+  enable: true
+  # 开启生产环境屏蔽，一定要先开启knife4j增强才会生效
+  production: false
+
+# 框架配置
+config:
+  # 生产环境接口
+  server-url: https://gxtyzx-server.websoft.top/api
+  upload-path: /www/wwwroot/gxtyzx-api/
+
+  # 阿里云OSS云存储
+  endpoint: https://oss-cn-shenzhen.aliyuncs.com
+  accessKeyId: LTAI4GKGZ9Z2Z8JZ77c3GNZP
+  accessKeySecret: BiDkpS7UXj72HWwDWaFZxiXjNFBNCM
+  bucketName: oss-gxwebsoft
+  bucketDomain: https://oss.wsdns.cn
+  aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com