Sfoglia il codice sorgente

1、增加读写分离逻辑
2、更改大部分字典字段,解决前端转换问题
3、增加自动切换数据源逻辑

rayson 1 anno fa
parent
commit
dcb83c6591
100 ha cambiato i file con 341 aggiunte e 863 eliminazioni
  1. 10 10
      citu-framework/citu-spring-boot-starter-biz-data-permission/src/main/java/com/citu/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java
  2. 40 0
      menduner/menduner-common/pom.xml
  3. 22 0
      menduner/menduner-common/src/main/java/com/citu/module/menduner/common/db/CituTransformDataSourceAutoConfiguration.java
  4. 19 0
      menduner/menduner-common/src/main/java/com/citu/module/menduner/common/db/DBTransformProperties.java
  5. 51 0
      menduner/menduner-common/src/main/java/com/citu/module/menduner/common/db/TransformDataSourceInterceptor.java
  6. 6 0
      menduner/menduner-common/src/main/java/com/citu/module/menduner/common/package-info.java
  7. 1 0
      menduner/menduner-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  8. 0 24
      menduner/menduner-mall-api/pom.xml
  9. 0 19
      menduner/menduner-mall-biz/Dockerfile
  10. 0 128
      menduner/menduner-mall-biz/pom.xml
  11. 0 17
      menduner/menduner-mall-biz/src/main/java/com/citu/module/menduner/mall/MendunerMallApplication.java
  12. 0 4
      menduner/menduner-mall-biz/src/main/java/com/citu/module/menduner/mall/package-info.java
  13. 0 106
      menduner/menduner-mall-biz/src/main/resources/application-dev.yaml
  14. 0 131
      menduner/menduner-mall-biz/src/main/resources/application-local.yaml
  15. 0 109
      menduner/menduner-mall-biz/src/main/resources/application.yaml
  16. 0 23
      menduner/menduner-mall-biz/src/main/resources/bootstrap-local.yaml
  17. 0 14
      menduner/menduner-mall-biz/src/main/resources/bootstrap.yaml
  18. 0 76
      menduner/menduner-mall-biz/src/main/resources/logback-spring.xml
  19. 2 1
      menduner/menduner-system-api/pom.xml
  20. 4 4
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/MendunerStatusEnum.java
  21. 3 3
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/school/SchoolStatusEnum.java
  22. 5 14
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/visits/MdeVisitsEnum.java
  23. 0 6
      menduner/menduner-system-biz/pom.xml
  24. 1 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/package-info.java
  25. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/CustomDataPermissionAutoConfiguration.java
  26. 6 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/package-info.java
  27. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/area/vo/AreaHotRespVO.java
  28. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/area/vo/AreaListReqVO.java
  29. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/area/vo/AreaPageReqVO.java
  30. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/area/vo/AreaRespVO.java
  31. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/area/vo/AreaSaveReqVO.java
  32. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/eduexp/vo/EduExpPageReqVO.java
  33. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/eduexp/vo/EduExpRespVO.java
  34. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/eduexp/vo/EduExpSaveReqVO.java
  35. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/bind/EnterpriseUserBindPageReqVO.java
  36. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/bind/EnterpriseUserBindRespVO.java
  37. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/bind/EnterpriseUserBindSaveReqVO.java
  38. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/post/EnterprisePostPageReqVO.java
  39. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/post/EnterprisePostRespVO.java
  40. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/post/EnterprisePostSaveReqVO.java
  41. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/register/EnterpriseRegisterPageReqVO.java
  42. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/register/EnterpriseRegisterRespVO.java
  43. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/register/EnterpriseRegisterSaveReqVO.java
  44. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterpriseListReqVO.java
  45. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
  46. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterpriseRespVO.java
  47. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterpriseSaveReqVO.java
  48. 4 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/vo/JobAdvertisedPageReqVO.java
  49. 5 5
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/vo/JobAdvertisedRespVO.java
  50. 5 5
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/vo/JobAdvertisedSaveReqVO.java
  51. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/vo/JobInterestedPageReqVO.java
  52. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/vo/JobInterestedRespVO.java
  53. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/vo/JobInterestedSaveReqVO.java
  54. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/major/vo/MajorPageReqVO.java
  55. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/major/vo/MajorRespVO.java
  56. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/major/vo/MajorSaveReqVO.java
  57. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/permission/role/MdeRolePageReqVO.java
  58. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/permission/role/MdeRoleRespVO.java
  59. 6 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/info/PersonInfoPageReqVO.java
  60. 6 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/info/PersonInfoRespVO.java
  61. 6 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/info/PersonInfoSaveReqVO.java
  62. 7 7
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/record/PersonBrowseRecordPageReqVO.java
  63. 7 7
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/record/PersonBrowseRecordRespVO.java
  64. 7 7
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/record/PersonBrowseRecordSaveReqVO.java
  65. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/skill/PersonSkillPageReqVO.java
  66. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/skill/PersonSkillSaveReqVO.java
  67. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/school/vo/SchoolPageReqVO.java
  68. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/school/vo/SchoolRespVO.java
  69. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/school/vo/SchoolSaveReqVO.java
  70. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/vo/MdeUserPageReqVO.java
  71. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/vo/MdeUserRespVO.java
  72. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/vo/MdeUserSaveReqVO.java
  73. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/vo/MdeUserUpdateStatusReqVO.java
  74. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/visits/vo/MdeVisitsListReqVO.java
  75. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/visits/vo/MdeVisitsPageReqVO.java
  76. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/visits/vo/MdeVisitsRespVO.java
  77. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/visits/vo/MdeVisitsSaveReqVO.java
  78. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/workexp/vo/WorkExpPageReqVO.java
  79. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/workexp/vo/WorkExpRespVO.java
  80. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/workexp/vo/WorkExpSaveReqVO.java
  81. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaChildrenRespVO.java
  82. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaListReqVO.java
  83. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaSimpleRespVO.java
  84. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppHotAreaRespVO.java
  85. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/AppMdeAuthController.java
  86. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/contact/AppEnterpriseUserContactRespVO.java
  87. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseRespVO.java
  88. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseSearchPageReqVO.java
  89. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseSimpleRespVO.java
  90. 5 5
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedDetailRespVO.java
  91. 4 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedPageReqVO.java
  92. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedRespVO.java
  93. 7 7
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedSearchPageReqVO.java
  94. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedSimpleRespVO.java
  95. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/eduexp/AppEduExpRespVO.java
  96. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/eduexp/AppEduExpSaveReqVO.java
  97. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/job/AppJobInterestedRespVO.java
  98. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/job/AppJobInterestedSaveReqVO.java
  99. 4 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/resume/AppPersonInfoSaveReqVO.java
  100. 7 7
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/vo/AppPersonBrowseRecordPageRespVO.java

+ 10 - 10
citu-framework/citu-spring-boot-starter-biz-data-permission/src/main/java/com/citu/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java

@@ -1,14 +1,14 @@
 package com.citu.framework.datapermission.core.db;
 
 import cn.hutool.core.collection.CollUtil;
-import com.citu.framework.common.util.collection.SetUtils;
-import com.citu.framework.datapermission.core.rule.DataPermissionRule;
-import com.citu.framework.datapermission.core.rule.DataPermissionRuleFactory;
-import com.citu.framework.mybatis.core.util.MyBatisUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
+import com.citu.framework.common.util.collection.SetUtils;
+import com.citu.framework.datapermission.core.rule.DataPermissionRule;
+import com.citu.framework.datapermission.core.rule.DataPermissionRuleFactory;
+import com.citu.framework.mybatis.core.util.MyBatisUtils;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.sf.jsqlparser.expression.*;
@@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * 数据权限拦截器,通过 {@link DataPermissionRule} 数据权限规则,重写 SQL 的方式来实现
  * 主要的 SQL 重写方法,可见 {@link #builderExpression(Expression, List)} 方法
- *
+ * <p>
  * 整体的代码实现上,参考 {@link com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor} 实现。
  * 所以每次 MyBatis Plus 升级时,需要 Review 下其具体的实现是否有变更!
  *
@@ -449,7 +449,7 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
      * 处理条件
      *
      * @param currentExpression 当前 where 条件
-     * @param tables 多个表
+     * @param tables            多个表
      */
     protected Expression builderExpression(Expression currentExpression, List<Table> tables) {
         // 没有表需要处理直接返回
@@ -507,7 +507,7 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
 
             // 单条规则的条件
             Expression oneExpress = rule.getExpression(tableName, table.getAlias());
-            if (oneExpress == null){
+            if (oneExpress == null) {
                 continue;
             }
             // 拼接到 allExpression 中
@@ -582,7 +582,7 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
 
         /**
          * 指定数据权限规则,对指定 MappedStatement 无需重写(不生效)的缓存
-         *
+         * <p>
          * value:{@link MappedStatement#getId()} 编号
          */
         @Getter
@@ -592,7 +592,7 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
          * 判断是否无需重写
          * ps:虽然有点中文式英语,但是容易读懂即可
          *
-         * @param ms MappedStatement
+         * @param ms    MappedStatement
          * @param rules 数据权限规则数组
          * @return 是否无需重写
          */
@@ -614,7 +614,7 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
         /**
          * 添加无需重写的 MappedStatement
          *
-         * @param ms MappedStatement
+         * @param ms    MappedStatement
          * @param rules 数据权限规则数组
          */
         public void addNoRewritable(MappedStatement ms, List<DataPermissionRule> rules) {

+ 40 - 0
menduner/menduner-common/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.citu</groupId>
+        <artifactId>menduner</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>menduner-common</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        门墩儿公共模块
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-common</artifactId>
+        </dependency>
+
+        <!-- Spring 核心 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-mybatis</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

+ 22 - 0
menduner/menduner-common/src/main/java/com/citu/module/menduner/common/db/CituTransformDataSourceAutoConfiguration.java

@@ -0,0 +1,22 @@
+package com.citu.module.menduner.common.db;
+
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * 数据源自动切换配置类
+ *
+ * @author rayson
+ **/
+@AutoConfiguration
+@EnableConfigurationProperties(DBTransformProperties.class)
+@ConditionalOnProperty(prefix = "citu.db.transform", name = "enable", havingValue = "true", matchIfMissing = true)
+public class CituTransformDataSourceAutoConfiguration {
+
+    @Bean
+    public TransformDataSourceInterceptor transformDataSourceInterceptor() {
+        return new TransformDataSourceInterceptor();
+    }
+}

+ 19 - 0
menduner/menduner-common/src/main/java/com/citu/module/menduner/common/db/DBTransformProperties.java

@@ -0,0 +1,19 @@
+package com.citu.module.menduner.common.db;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+
+@Data
+@ConfigurationProperties(prefix = "citu.db.transform")
+public class DBTransformProperties {
+
+    /**
+     * 是否开启,默认为 false
+     */
+    private boolean enable = true;
+
+
+
+
+}

+ 51 - 0
menduner/menduner-common/src/main/java/com/citu/module/menduner/common/db/TransformDataSourceInterceptor.java

@@ -0,0 +1,51 @@
+package com.citu.module.menduner.common.db;
+
+import com.baomidou.dynamic.datasource.enums.DdConstants;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.cache.CacheKey;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.SqlCommandType;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.plugin.Intercepts;
+import org.apache.ibatis.plugin.Invocation;
+import org.apache.ibatis.plugin.Signature;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
+
+/**
+ * 切换数据源拦截器
+ * 读写分离   主写从读
+ * 根据sql类型 切换数据源
+ *
+ * @author rayson
+ **/
+@Intercepts({
+        @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class}),
+        @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class, CacheKey.class, BoundSql.class}),
+        @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})})
+@Slf4j
+public class TransformDataSourceInterceptor implements Interceptor {
+
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        Object[] args = invocation.getArgs();
+        MappedStatement ms = (MappedStatement) args[0];
+        String pushedDataSource = null;
+        try {
+            String dataSource = DdConstants.MASTER;
+            if (SqlCommandType.SELECT == ms.getSqlCommandType()) {
+                // select
+                dataSource = DdConstants.SLAVE;
+            }
+            DynamicDataSourceContextHolder.push(dataSource);
+            return invocation.proceed();
+        } finally {
+            if (null != pushedDataSource) {
+                DynamicDataSourceContextHolder.poll();
+            }
+        }
+    }
+}

+ 6 - 0
menduner/menduner-common/src/main/java/com/citu/module/menduner/common/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * menduner公共
+ *
+ * @author rayson
+ */
+package com.citu.module.menduner.common;

+ 1 - 0
menduner/menduner-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+com.citu.module.menduner.common.db.CituTransformDataSourceAutoConfiguration

+ 0 - 24
menduner/menduner-mall-api/pom.xml

@@ -1,24 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.citu</groupId>
-        <artifactId>menduner</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <artifactId>menduner-mall-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        门墩儿商城 模块 API,暴露给其它模块调用
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-common</artifactId>
-        </dependency>
-    </dependencies>
-</project>

+ 0 - 19
menduner/menduner-mall-biz/Dockerfile

@@ -1,19 +0,0 @@
-## AdoptOpenJDK 停止发布 OpenJDK 二进制,而 Eclipse Temurin 是它的延伸,提供更好的稳定性
-## 感谢复旦核博士的建议!灰子哥,牛皮!
-FROM adoptopenjdk/openjdk11
-
-## 创建目录,并使用它作为工作目录
-RUN mkdir -p /menduner-mall-biz
-WORKDIR /menduner-mall-biz
-## 将后端项目的 Jar 文件,复制到镜像中
-COPY ./target/menduner-mall-biz.jar app.jar
-
-## 设置 TZ 时区
-## 设置 JAVA_OPTS 环境变量,可通过 docker run -e "JAVA_OPTS=" 进行覆盖
-ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m"
-
-## 暴露后端项目的 48080 端口
-EXPOSE 48100
-
-## 启动后端项目
-CMD java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar

+ 0 - 128
menduner/menduner-mall-biz/pom.xml

@@ -1,128 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.citu</groupId>
-        <artifactId>menduner</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>menduner-mall-biz</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        门墩儿商城 模块
-    </description>
-
-    <dependencies>
-        <!-- Spring Cloud 基础 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-bootstrap</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-env</artifactId>
-        </dependency>
-
-        <!-- 依赖服务 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-module-system-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-module-infra-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
-        <!-- 业务组件 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-biz-data-permission</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-biz-tenant</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-biz-ip</artifactId>
-        </dependency>
-
-        <!-- Web 相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-security</artifactId>
-        </dependency>
-
-        <!-- DB 相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-mybatis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-redis</artifactId>
-        </dependency>
-
-        <!-- RPC 远程调用相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-rpc</artifactId>
-        </dependency>
-
-        <!-- Registry 注册中心相关 -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- Config 配置中心相关 -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- Test 测试相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- 监控相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-monitor</artifactId>
-        </dependency>
-
-
-
-    </dependencies>
-
-    <build>
-        <!-- 设置构建的 jar 包名 -->
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <!-- 打包 -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 17
menduner/menduner-mall-biz/src/main/java/com/citu/module/menduner/mall/MendunerMallApplication.java

@@ -1,17 +0,0 @@
-package com.citu.module.menduner.mall;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * @author rayson
- * @description MendunerJobApplication 门墩儿 求职模块 启动类
- * @create 2024/4/25 下午5:31
- **/
-@SpringBootApplication
-public class MendunerMallApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(MendunerMallApplication.class, args);
-    }
-}

+ 0 - 4
menduner/menduner-mall-biz/src/main/java/com/citu/module/menduner/mall/package-info.java

@@ -1,4 +0,0 @@
-/**
- * menduner 求职模块
- */
-package com.citu.module.menduner.mall;

+ 0 - 106
menduner/menduner-mall-biz/src/main/resources/application-dev.yaml

@@ -1,106 +0,0 @@
---- #################### 数据库相关配置 ####################
-spring:
-  # 数据源配置项
-  autoconfigure:
-    exclude:
-  datasource:
-    druid: # Druid 【监控】相关的全局配置
-      web-stat-filter:
-        enabled: true
-      stat-view-servlet:
-        enabled: true
-        allow: # 设置白名单,不填则允许所有访问
-        url-pattern: /druid/*
-        login-username: # 控制台管理用户名和密码
-        login-password:
-      filter:
-        stat:
-          enabled: true
-          log-slow-sql: true # 慢 SQL 记录
-          slow-sql-millis: 100
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-    dynamic: # 多数据源配置
-      druid: # Druid 【连接池】相关的全局配置
-        initial-size: 5 # 初始连接数
-        min-idle: 10 # 最小连接池数量
-        max-active: 20 # 最大连接池数量
-        max-wait: 600000 # 配置获取连接等待超时的时间,单位:毫秒
-        time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位:毫秒
-        min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间,单位:毫秒
-        max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间,单位:毫秒
-        validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效
-        test-while-idle: true
-        test-on-borrow: false
-        test-on-return: false
-      primary: master
-      datasource:
-        master:
-          name: ruoyi-vue-pro
-          url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true
-          driver-class-name: com.mysql.jdbc.Driver
-          username: root
-          password: 3WLiVUBEwTbvAfsh
-        slave: # 模拟从库,可根据自己需要修改 # 模拟从库,可根据自己需要修改
-          name: ruoyi-vue-pro
-          url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true
-          driver-class-name: com.mysql.jdbc.Driver
-          username: root
-          password: 3WLiVUBEwTbvAfsh
-
-  # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
-  data:
-    redis:
-      host: 400-infra.server.iocoder.cn # 地址
-      port: 6379 # 端口
-      database: 1 # 数据库索引
-#      password: 123456 # 密码,建议生产环境开启
-
---- #################### MQ 消息队列相关配置 ####################
-
---- #################### 定时任务相关配置 ####################
-xxl:
-  job:
-    admin:
-      addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址
-
---- #################### 服务保障相关配置 ####################
-
-# Lock4j 配置项
-lock4j:
-  acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒
-  expire: 30000 # 分布式锁的超时时间,默认为 30 毫秒
-
---- #################### 监控相关配置 ####################
-
-# Actuator 监控端点的配置项
-management:
-  endpoints:
-    web:
-      base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator
-      exposure:
-        include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ,可以开放所有端点。
-
-# Spring Boot Admin 配置项
-spring:
-  boot:
-    admin:
-      # Spring Boot Admin Client 客户端的相关配置
-      client:
-        instance:
-          service-host-type: IP # 注册实例时,优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
-      # Spring Boot Admin Server 服务端的相关配置
-      context-path: /admin # 配置 Spring
-
---- #################### 芋道相关配置 ####################
-
-# 芋道配置项,设置当前项目所有自定义的配置
-citu:
-  xss:
-    enable: false
-  web:
-    admin-ui:
-      url: http://dashboard.citu.iocoder.cn # Admin 管理后台 UI 的地址
-  demo: true # 开启演示模式

+ 0 - 131
menduner/menduner-mall-biz/src/main/resources/application-local.yaml

@@ -1,131 +0,0 @@
---- #################### 数据库相关配置 ####################
-spring:
-  # 数据源配置项
-  autoconfigure:
-    exclude:
-      - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置
-  datasource:
-    druid: # Druid 【监控】相关的全局配置
-      web-stat-filter:
-        enabled: true
-      stat-view-servlet:
-        enabled: true
-        allow: # 设置白名单,不填则允许所有访问
-        url-pattern: /druid/*
-        login-username: # 控制台管理用户名和密码
-        login-password:
-      filter:
-        stat:
-          enabled: true
-          log-slow-sql: true # 慢 SQL 记录
-          slow-sql-millis: 100
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-    dynamic: # 多数据源配置
-      druid: # Druid 【连接池】相关的全局配置
-        initial-size: 1 # 初始连接数
-        min-idle: 1 # 最小连接池数量
-        max-active: 20 # 最大连接池数量
-        max-wait: 600000 # 配置获取连接等待超时的时间,单位:毫秒
-        time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位:毫秒
-        min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间,单位:毫秒
-        max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间,单位:毫秒
-        validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效
-        test-while-idle: true
-        test-on-borrow: false
-        test-on-return: false
-      primary: master
-      datasource:
-        master:
-          name: ruoyi-vue-pro
-          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-#          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
-#          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例
-#          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
-#          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
-          username: root
-          password: 123456
-#          username: sa
-#          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
-        slave: # 模拟从库,可根据自己需要修改
-          name: ruoyi-vue-pro
-          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-#          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
-#          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
-#          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
-#          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例
-          username: root
-          password: 123456
-#          username: sa
-#          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
-
-  # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
-  data:
-    redis:
-      host: 127.0.0.1 # 地址
-      port: 6379 # 端口
-      database: 0 # 数据库索引
-#      password: 123456 # 密码,建议生产环境开启
-
---- #################### MQ 消息队列相关配置 ####################
-
---- #################### 定时任务相关配置 ####################
-
-xxl:
-  job:
-    enabled: false # 是否开启调度中心,默认为 true 开启
-    admin:
-      addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址
-
---- #################### 服务保障相关配置 ####################
-
-# Lock4j 配置项
-lock4j:
-  acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒
-  expire: 30000 # 分布式锁的超时时间,默认为 30 毫秒
-
---- #################### 监控相关配置 ####################
-
-# Actuator 监控端点的配置项
-management:
-  endpoints:
-    web:
-      base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator
-      exposure:
-        include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ,可以开放所有端点。
-
-# Spring Boot Admin 配置项
-spring:
-  boot:
-    admin:
-      # Spring Boot Admin Client 客户端的相关配置
-      client:
-        instance:
-          service-host-type: IP # 注册实例时,优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
-
-# 日志文件配置
-logging:
-  level:
-    # 配置自己写的 MyBatis Mapper 打印日志
-    com.citu.module.system.dal.mysql: debug
-    com.citu.module.system.dal.mysql.sensitiveword.SensitiveWordMapper: INFO # 配置 SensitiveWordMapper 的日志级别为 info
-    com.citu.module.system.dal.mysql.sms.SmsChannelMapper: INFO # 配置 SmsChannelMapper 的日志级别为 info
-
---- #################### 芋道相关配置 ####################
-
-# 芋道配置项,设置当前项目所有自定义的配置
-citu:
-  env: # 多环境的配置项
-    tag: ${HOSTNAME}
-  web:
-    admin-ui:
-      url: http://dashboard.citu.iocoder.cn # Admin 管理后台 UI 的地址
-  security:
-    mock-enable: true
-  xss:
-    enable: false
-  access-log: # 访问日志的配置项
-    enable: false
-  demo: false # 关闭演示模式

+ 0 - 109
menduner/menduner-mall-biz/src/main/resources/application.yaml

@@ -1,109 +0,0 @@
-spring:
-  main:
-    allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。
-    allow-bean-definition-overriding: true # 允许 Bean 覆盖,例如说 Feign 等会存在重复定义的服务
-
-  # Servlet 配置
-  servlet:
-    # 文件上传相关配置项
-    multipart:
-      max-file-size: 16MB # 单个文件大小
-      max-request-size: 32MB # 设置总上传的文件大小
-  mvc:
-    pathmatch:
-      matching-strategy: ANT_PATH_MATCHER # 解决 SpringFox 与 SpringBoot 2.6.x 不兼容的问题,参见 SpringFoxHandlerProviderBeanPostProcessor 类
-
-  # Jackson 配置项
-  jackson:
-    serialization:
-      write-dates-as-timestamps: true # 设置 LocalDateTime 的格式,使用时间戳
-      write-date-timestamps-as-nanoseconds: false # 设置不使用 nanoseconds 的格式。例如说 1611460870.401,而是直接 1611460870401
-      write-durations-as-timestamps: true # 设置 Duration 的格式,使用时间戳
-      fail-on-empty-beans: false # 允许序列化无属性的 Bean
-
-  # Cache 配置项
-  cache:
-    type: REDIS
-    redis:
-      time-to-live: 1h # 设置过期时间为 1 小时
-
---- #################### 接口文档配置 ####################
-
-springdoc:
-  api-docs:
-    enabled: true # 1. 是否开启 Swagger 接文档的元数据
-    path: /v3/api-docs
-  swagger-ui:
-    enabled: true # 2.1 是否开启 Swagger 文档的官方 UI 界面
-    path: /swagger-ui.html
-  default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档
-
-knife4j:
-  enable: true # 2.2 是否开启 Swagger 文档的 Knife4j UI 界面
-  setting:
-    language: zh_cn
-
-# MyBatis Plus 的配置项
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true # 虽然默认为 true ,但是还是显示去指定下。
-  global-config:
-    db-config:
-      id-type: NONE # “智能”模式,基于 IdTypeEnvironmentPostProcessor + 数据源的类型,自动适配成 AUTO、INPUT 模式。
-      #      id-type: AUTO # 自增 ID,适合 MySQL 等直接自增的数据库
-      #      id-type: INPUT # 用户输入 ID,适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库
-      #      id-type: ASSIGN_ID # 分配 ID,默认使用雪花算法。注意,Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时,需要去除实体类上的 @KeySequence 注解
-      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
-      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
-    banner: false # 关闭控制台的 Banner 打印
-  type-aliases-package: ${citu.info.base-package}.dal.dataobject
-  encryptor:
-    password: XDV71a+xqStEA3WH # 加解密的秘钥,可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成
-
-mybatis-plus-join:
-  banner: false # 关闭控制台的 Banner 打印
-
-# Spring Data Redis 配置
-spring:
-  data:
-    redis:
-      repositories:
-        enabled: false # 项目未使用到 Spring Data Redis 的 Repository,所以直接禁用,保证启动速度
-
-# VO 转换(数据翻译)相关
-easy-trans:
-  is-enable-global: true # 启用全局翻译(拦截所有 SpringMVC ResponseBody 进行自动翻译 )。如果对于性能要求很高可关闭此配置,或通过 @IgnoreTrans 忽略某个接口
-  is-enable-cloud: false # 禁用 TransType.RPC 微服务模式
-
---- #################### RPC 远程调用相关配置 ####################
-
---- #################### MQ 消息队列相关配置 ####################
-
---- #################### 定时任务相关配置 ####################
-
-xxl:
-  job:
-    executor:
-      appname: ${spring.application.name} # 执行器 AppName
-      logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
-    accessToken: default_token # 执行器通讯TOKEN
-
---- #################### 芋道相关配置 ####################
-
-citu:
-  info:
-    version: 1.0.0
-    base-package: com.citu.module.product
-  swagger:
-    title: 管理后台
-    description: 提供管理员管理的所有功能
-    version: ${citu.info.version}
-    base-package: ${citu.info.base-package}
-  captcha:
-    enable: true # 验证码的开关,默认为 true;
-  tenant: # 多租户相关配置项
-    enable: true
-    ignore-urls:
-    ignore-tables:
-
-debug: false

+ 0 - 23
menduner/menduner-mall-biz/src/main/resources/bootstrap-local.yaml

@@ -1,23 +0,0 @@
---- #################### 注册中心相关配置 ####################
-
-spring:
-  cloud:
-    nacos:
-      server-addr: ${nacosHost:127.0.0.1:8848}
-      discovery:
-        namespace: dev # 命名空间。这里使用 dev 开发环境
-        metadata:
-          version: 1.0.0 # 服务实例的版本号,可用于灰度发布
-
---- #################### 配置中心相关配置 ####################
-
-spring:
-  cloud:
-    nacos:
-      # Nacos Config 配置项,对应 NacosConfigProperties 配置属性类
-      config:
-        server-addr: ${nacosHost:127.0.0.1:8848} # Nacos 服务器地址
-        namespace: dev # 命名空间 dev 的ID,不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev,这里使用 dev 开发环境
-        group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP
-        name: ${spring.application.name} # 使用的 Nacos 配置集的 dataId,默认为 spring.application.name
-        file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名,同时也是 Nacos 配置集的配置格式,默认为 properties

+ 0 - 14
menduner/menduner-mall-biz/src/main/resources/bootstrap.yaml

@@ -1,14 +0,0 @@
-spring:
-  application:
-    name: menduner-service
-
-  profiles:
-    active: local
-
-server:
-  port: 48200
-
-# 日志文件配置。注意,如果 logging.file.name 不放在 bootstrap.yaml 配置文件,而是放在 application.yaml 中,会导致出现 LOG_FILE_IS_UNDEFINED 文件
-logging:
-  file:
-    name: ${user.home}/logs/${spring.application.name}.log # 日志文件名,全路径

+ 0 - 76
menduner/menduner-mall-biz/src/main/resources/logback-spring.xml

@@ -1,76 +0,0 @@
-<configuration>
-    <!-- 引用 Spring Boot 的 logback 基础配置 -->
-    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
-    <!-- 变量 citu.info.base-package,基础业务包 -->
-    <springProperty scope="context" name="citu.info.base-package" source="citu.info.base-package"/>
-    <!-- 格式化输出:%d 表示日期,%X{tid} SkWalking 链路追踪编号,%thread 表示线程名,%-5level:级别从左显示 5 个字符宽度,%msg:日志消息,%n是换行符 -->
-    <property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | %highlight(${LOG_LEVEL_PATTERN:-%5p} ${PID:- }) | %boldYellow(%thread [%tid]) %boldGreen(%-40.40logger{39}) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
-
-    <!-- 控制台 Appender -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">     
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <pattern>${PATTERN_DEFAULT}</pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!-- 文件 Appender -->
-    <!-- 参考 Spring Boot 的 file-appender.xml 编写 -->
-    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <pattern>${PATTERN_DEFAULT}</pattern>
-            </layout>
-        </encoder>
-        <!-- 日志文件名 -->
-        <file>${LOG_FILE}</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 滚动后的日志文件名 -->
-            <fileNamePattern>${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}</fileNamePattern>
-            <!-- 启动服务时,是否清理历史日志,一般不建议清理 -->
-            <cleanHistoryOnStart>${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}</cleanHistoryOnStart>
-            <!-- 日志文件,到达多少容量,进行滚动 -->
-            <maxFileSize>${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}</maxFileSize>
-            <!-- 日志文件的总大小,0 表示不限制 -->
-            <totalSizeCap>${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}</totalSizeCap>
-            <!-- 日志文件的保留天数 -->
-            <maxHistory>${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}</maxHistory>
-        </rollingPolicy>
-    </appender>
-    <!-- 异步写入日志,提升性能 -->
-    <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志。默认的,如果队列的 80% 已满,则会丢弃 TRACT、DEBUG、INFO 级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度,该值会影响性能。默认值为 256 -->
-        <queueSize>256</queueSize>
-        <appender-ref ref="FILE"/>
-    </appender>
-
-    <!-- SkyWalking GRPC 日志收集,实现日志中心。注意:SkyWalking 8.4.0 版本开始支持 -->
-    <appender name="GRPC" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <pattern>${PATTERN_DEFAULT}</pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!-- 本地环境 -->
-    <springProfile name="local">
-        <root level="INFO">
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="GRPC"/> <!-- 本地环境下,如果不想接入 SkyWalking 日志服务,可以注释掉本行 -->
-            <appender-ref ref="ASYNC"/>  <!-- 本地环境下,如果不想打印日志,可以注释掉本行 -->
-        </root>
-    </springProfile>
-    <!-- 其它环境 -->
-    <springProfile name="dev,test,stage,prod,default">
-        <root level="INFO">
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="ASYNC"/>
-            <appender-ref ref="GRPC"/>
-        </root>
-    </springProfile>
-
-</configuration>

+ 2 - 1
menduner/menduner-system-api/pom.xml

@@ -18,7 +18,8 @@
     <dependencies>
         <dependency>
             <groupId>com.citu</groupId>
-            <artifactId>citu-common</artifactId>
+            <artifactId>menduner-common</artifactId>
+            <version>${revision}</version>
         </dependency>
 
         <dependency>

+ 4 - 4
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/MendunerStatusEnum.java

@@ -14,15 +14,15 @@ import java.util.Arrays;
 @Getter
 @AllArgsConstructor
 public enum MendunerStatusEnum implements IntArrayValuable {
-    ENABLE(0, "开启"),
-    DISABLE(1, "关闭");
+    ENABLE("0", "开启"),
+    DISABLE("1", "关闭");
 
-    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(MendunerStatusEnum::getStatus).toArray();
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(c->Integer.valueOf(c.status)).toArray();
 
     /**
      * 状态值
      */
-    private final Integer status;
+    private final String status;
     /**
      * 状态名
      */

+ 3 - 3
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/school/SchoolStatusEnum.java

@@ -9,7 +9,7 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum SchoolStatusEnum {
-    NORMAL(0),
-    DISABLE(1);
-    private final Integer type;
+    NORMAL("0"),
+    DISABLE("1");
+    private final String type;
 }

+ 5 - 14
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/visits/MdeVisitsEnum.java

@@ -1,38 +1,29 @@
 package com.citu.module.menduner.system.enums.visits;
 
-import com.citu.framework.common.core.IntArrayValuable;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-import java.util.Arrays;
-
 /**
  * 访问量(0职位类型点击,1发布职位点击,2企业点击)
  **/
 @Getter
 @AllArgsConstructor
-public enum MdeVisitsEnum implements IntArrayValuable {
+public enum MdeVisitsEnum {
 
-    POSITION_CLICK(0, "职位类型点击"),
+    POSITION_CLICK("0", "职位类型点击"),
 
-    POSITION_PUBLISH_CLICK(1, "发布职位点击"),
-    ENTERPRISE_CLICK(2, "企业点击")
-    ;
+    POSITION_PUBLISH_CLICK("1", "发布职位点击"),
+    ENTERPRISE_CLICK("2", "企业点击");
 
-    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(MdeVisitsEnum::getType).toArray();
 
     /**
      * 类型
      */
-    private final Integer type;
+    private final String type;
     /**
      * 状态名
      */
     private final String name;
 
-    @Override
-    public int[] array() {
-        return ARRAYS;
-    }
 
 }

+ 0 - 6
menduner/menduner-system-biz/pom.xml

@@ -35,12 +35,6 @@
             <artifactId>menduner-system-api</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-module-system-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
 
         <!-- 业务组件 -->
         <dependency>

+ 1 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/package-info.java

@@ -1,6 +1,4 @@
 /**
- * 基于部门的数据权限规则
- *
- * @author 芋道源码
+ * @author rayson
  */
 package com.citu.module.menduner.system.config;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/CustomDataPermissionAutoConfiguration.java

@@ -22,7 +22,7 @@ public class CustomDataPermissionAutoConfiguration {
 
     @Bean
     public CustomDataPermissionRule customDataPermissionRule(MendunerPermissionApi permissionApi,
-                                                 List<CustomDataPermissionRuleCustomizer> customizers) {
+                                                             List<CustomDataPermissionRuleCustomizer> customizers) {
         // Cloud 专属逻辑:优先使用本地的 MendunerPermissionApi 实现类,而不是 Feign 调用
         // 原因:在创建租户时,租户还没创建好,导致 Feign 调用获取数据权限时,报“租户不存在”的错误
         try {

+ 6 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * 基于企业的数据权限规则
+ *
+ * @author rayson
+ */
+package com.citu.module.menduner.system.config.permission;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/area/vo/AreaHotRespVO.java

@@ -17,7 +17,7 @@ public class AreaHotRespVO {
     private String name;
 
     @Schema(description = "区域类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "顺序", example = "1")
     private Integer sort;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/area/vo/AreaListReqVO.java

@@ -16,7 +16,7 @@ public class AreaListReqVO {
     private String name;
 
     @Schema(description = "区域类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "父级编号", example = "6080")
     private Long parentId;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/area/vo/AreaPageReqVO.java

@@ -19,7 +19,7 @@ public class AreaPageReqVO extends PageParam {
     private String name;
 
     @Schema(description = "区域类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "上级区域", example = "9103")
     private Long parentId;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/area/vo/AreaRespVO.java

@@ -24,7 +24,7 @@ public class AreaRespVO {
 
     @Schema(description = "区域类型", example = "2")
     @ExcelProperty("区域类型")
-    private Integer type;
+    private String type;
 
     @Schema(description = "上级区域", example = "9103")
     @ExcelProperty("上级区域")

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/area/vo/AreaSaveReqVO.java

@@ -16,7 +16,7 @@ public class AreaSaveReqVO {
     private String name;
 
     @Schema(description = "区域类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "上级区域", example = "9103")
     private Long parentId;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/eduexp/vo/EduExpPageReqVO.java

@@ -28,10 +28,10 @@ public class EduExpPageReqVO extends PageParam {
     private String schoolName;
 
     @Schema(description = "学历(0初中及以下 | 1中专/中技 | 2高中 | 3大专 | 4 本科 5 硕士 6 博士 99 其他)", example = "2")
-    private Integer educationType;
+    private String educationType;
 
     @Schema(description = "学制类型(0 全日制 | 1 非全日制)", example = "1")
-    private Integer educationSystemType;
+    private String educationSystemType;
 
     @Schema(description = "专业id", example = "30649")
     private Long majorId;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/eduexp/vo/EduExpRespVO.java

@@ -39,12 +39,12 @@ public class EduExpRespVO {
     @Schema(description = "学历(0初中及以下 | 1中专/中技 | 2高中 | 3大专 | 4 本科 5 硕士 6 博士 99 其他)", example = "2")
     @ExcelProperty(value = "学历(0初中及以下 | 1中专/中技 | 2高中 | 3大专 | 4 本科 5 硕士 6 博士 99 其他)", converter = DictConvert.class)
     @DictFormat(MENDUNER_EDUCATION_TYPE)
-    private Integer educationType;
+    private String educationType;
 
     @Schema(description = "学制类型(0 全日制 | 1 非全日制)", example = "1")
     @ExcelProperty(value = "学制类型(0 全日制 | 1 非全日制)", converter = DictConvert.class)
     @DictFormat(MENDUNER_EDUCATION_SYSTEM_TYPE)
-    private Integer educationSystemType;
+    private String educationSystemType;
 
     @Schema(description = "专业id", example = "30649")
     @ExcelProperty("专业id")

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/eduexp/vo/EduExpSaveReqVO.java

@@ -27,11 +27,11 @@ public class EduExpSaveReqVO {
 
     @NotNull(message = "{1_100_006_002}")
     @Schema(description = "学历(0初中及以下 | 1中专/中技 | 2高中 | 3大专 | 4 本科 5 硕士 6 博士 99 其他)", example = "2")
-    private Integer educationType;
+    private String educationType;
 
     @NotNull(message = "{1_100_006_003}")
     @Schema(description = "学制类型(0 全日制 | 1 非全日制)", example = "1")
-    private Integer educationSystemType;
+    private String educationSystemType;
 
     @Schema(description = "专业id", example = "30649")
     private Long majorId;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/bind/EnterpriseUserBindPageReqVO.java

@@ -25,7 +25,7 @@ public class EnterpriseUserBindPageReqVO extends PageParam {
     private String name;
 
     @Schema(description = "用户性别")
-    private Integer sex;
+    private String sex;
 
     @Schema(description = "头像地址")
     private String avatar;
@@ -40,7 +40,7 @@ public class EnterpriseUserBindPageReqVO extends PageParam {
     private Long postId;
 
     @Schema(description = "帐号状态(0正常 1停用 2 等待审核 3不通过)", example = "2")
-    private Integer status;
+    private String status;
 
     @Schema(description = "最后登录IP")
     private String loginIp;

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/bind/EnterpriseUserBindRespVO.java

@@ -40,7 +40,7 @@ public class EnterpriseUserBindRespVO {
 
     @Schema(description = "用户性别")
     @ExcelProperty("用户性别")
-    private Integer sex;
+    private String sex;
 
     @Schema(description = "头像地址")
     @ExcelProperty("头像地址")
@@ -57,7 +57,7 @@ public class EnterpriseUserBindRespVO {
     @Schema(description = "帐号状态(0正常 1停用 2 等待审核 3不通过)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty(value = "帐号状态(0正常 1停用 2 等待审核 3不通过)", converter = DictConvert.class)
     @DictFormat(MENDUNER_STATUS)
-    private Integer status;
+    private String status;
 
     @Schema(description = "最后登录IP")
     @ExcelProperty("最后登录IP")
@@ -70,7 +70,7 @@ public class EnterpriseUserBindRespVO {
     @Schema(description = "用户类型(0普通企业用户 1 企业管理员)", example = "2")
     @ExcelProperty(value = "用户类型(0普通企业用户 1 企业管理员)", converter = DictConvert.class)
     @DictFormat(USER_TYPE)
-    private Integer userType;
+    private String userType;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/bind/EnterpriseUserBindSaveReqVO.java

@@ -31,7 +31,7 @@ public class EnterpriseUserBindSaveReqVO {
     private String name;
 
     @Schema(description = "用户性别")
-    private Integer sex;
+    private String sex;
 
     @Schema(description = "头像地址")
     private String avatar;
@@ -44,7 +44,7 @@ public class EnterpriseUserBindSaveReqVO {
 
     @Schema(description = "帐号状态(0正常 1停用 2 等待审核 3不通过)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "{1_200_018_001}")
-    private Integer status;
+    private String status;
 
     @Schema(description = "最后登录IP")
     private String loginIp;
@@ -53,6 +53,6 @@ public class EnterpriseUserBindSaveReqVO {
     private LocalDateTime loginDate;
 
     @Schema(description = "用户类型(0普通企业用户 1 企业管理员)", example = "2")
-    private Integer userType;
+    private String userType;
 
 }

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/post/EnterprisePostPageReqVO.java

@@ -30,7 +30,7 @@ public class EnterprisePostPageReqVO extends PageParam {
     private String nameEn;
 
     @Schema(description = "状态(0正常 1停用)", example = "2")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/post/EnterprisePostRespVO.java

@@ -38,7 +38,7 @@ public class EnterprisePostRespVO {
 
     @Schema(description = "状态(0正常 1停用)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("状态(0正常 1停用)")
-    private Integer status;
+    private String status;
 
     @Schema(description = "备注", example = "随便")
     @ExcelProperty("备注")

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/post/EnterprisePostSaveReqVO.java

@@ -33,7 +33,7 @@ public class EnterprisePostSaveReqVO {
 
     @Schema(description = "状态(0正常 1停用)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "{1_200_018_001}")
-    private Integer status;
+    private String status;
 
     @Schema(description = "备注", example = "随便")
     private String remark;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/register/EnterpriseRegisterPageReqVO.java

@@ -28,7 +28,7 @@ public class EnterpriseRegisterPageReqVO extends PageParam {
     private String email;
 
     @Schema(description = "帐号状态(0正常 1停用 2 等待审核 3不通过)", example = "2")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/register/EnterpriseRegisterRespVO.java

@@ -43,7 +43,7 @@ public class EnterpriseRegisterRespVO {
     @Schema(description = "帐号状态(0正常 1停用 2 等待审核 3不通过)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty(value = "帐号状态(0正常 1停用 2 等待审核 3不通过)", converter = DictConvert.class)
     @DictFormat(MENDUNER_STATUS)
-    private Integer status;
+    private String status;
 
     @Schema(description = "审核原因", example = "不喜欢")
     @ExcelProperty("审核原因")

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/register/EnterpriseRegisterSaveReqVO.java

@@ -30,7 +30,7 @@ public class EnterpriseRegisterSaveReqVO {
 
     @Schema(description = "帐号状态(0正常 1停用 2 等待审核 3不通过)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "{1_200_018_001}")
-    private Integer status;
+    private String status;
 
     @Schema(description = "审核原因", example = "不喜欢")
     private String reason;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterpriseListReqVO.java

@@ -11,6 +11,6 @@ public class EnterpriseListReqVO {
     private String name;
 
     @Schema(description = "展示状态,参见 MendunerStatusEnum 枚举类", example = "1")
-    private Integer status;
+    private String status;
 
 }

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java

@@ -38,13 +38,13 @@ public class EnterprisePageReqVO extends PageParam {
     private Long industryId;
 
     @Schema(description = "融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)", example = "2")
-    private Integer financingStatus;
+    private String financingStatus;
 
     @Schema(description = "人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)")
-    private Integer scale;
+    private String scale;
 
     @Schema(description = "帐号状态(0正常 1停用)")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterpriseRespVO.java

@@ -61,12 +61,12 @@ public class EnterpriseRespVO {
     @Schema(description = "融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)", example = "2")
     @ExcelProperty(value = "融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)", converter = DictConvert.class)
     @DictFormat(MENDUNER_FINANCING_STATUS)
-    private Integer financingStatus;
+    private String financingStatus;
 
     @Schema(description = "人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)")
     @ExcelProperty(value = "人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)", converter = DictConvert.class)
     @DictFormat(MENDUNER_SCALE)
-    private Integer scale;
+    private String scale;
 
     @Schema(description = "公司福利")
     @ExcelProperty("公司福利")
@@ -90,7 +90,7 @@ public class EnterpriseRespVO {
 
     @Schema(description = "状态(0正常 1停用)")
     @ExcelProperty("状态")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterpriseSaveReqVO.java

@@ -40,10 +40,10 @@ public class EnterpriseSaveReqVO {
     private Long industryId;
 
     @Schema(description = "融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)", example = "2")
-    private Integer financingStatus;
+    private String financingStatus;
 
     @Schema(description = "人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)")
-    private Integer scale;
+    private String scale;
 
     @Schema(description = "公司福利")
     private List<String> welfareList;
@@ -61,6 +61,6 @@ public class EnterpriseSaveReqVO {
     private String receivedHonors;
 
     @Schema(description = "帐号状态(0正常 1停用)")
-    private Integer status;
+    private String status;
 
 }

+ 4 - 4
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/vo/JobAdvertisedPageReqVO.java

@@ -36,13 +36,13 @@ public class JobAdvertisedPageReqVO extends PageParam {
     private Long positionId;
 
     @Schema(description = "招聘类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "工作经验", example = "1")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历要求", example = "1")
-    private Integer eduType;
+    private String eduType;
 
     @Schema(description = "职位标签")
     private List<String> tagList;
@@ -54,7 +54,7 @@ public class JobAdvertisedPageReqVO extends PageParam {
     private String requirement;
 
     @Schema(description = "职位状态", example = "2")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 5 - 5
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/vo/JobAdvertisedRespVO.java

@@ -47,15 +47,15 @@ public class JobAdvertisedRespVO {
     @Schema(description = "招聘类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty(value = "招聘类型", converter = DictConvert.class)
     @DictFormat(MENDUNER_JOB_TYPE)
-    private Integer type;
+    private String type;
 
     @Schema(description = "工作经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("工作经验")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历要求", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("学历要求")
-    private Integer eduType;
+    private String eduType;
 
     @Schema(description = "薪酬from")
     @ExcelProperty("薪酬from")
@@ -67,7 +67,7 @@ public class JobAdvertisedRespVO {
 
     @Schema(description = "薪酬单位")
     @ExcelProperty("薪酬单位")
-    private Integer payUnit;
+    private String payUnit;
 
     @Schema(description = "职位标签")
     @ExcelProperty("职位标签")
@@ -96,7 +96,7 @@ public class JobAdvertisedRespVO {
     @Schema(description = "职位状态", example = "2")
     @ExcelProperty(value = "职位状态", converter = DictConvert.class)
     @DictFormat(MENDUNER_STATUS)
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

+ 5 - 5
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/vo/JobAdvertisedSaveReqVO.java

@@ -37,15 +37,15 @@ public class JobAdvertisedSaveReqVO {
 
     @Schema(description = "招聘类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "{1_200_010_004}")
-    private Integer type;
+    private String type;
 
     @Schema(description = "工作经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "{1_200_010_006}")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历要求", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "{1_200_010_007}")
-    private Integer eduType;
+    private String eduType;
 
     @Schema(description = "薪酬from")
     private BigDecimal payFrom;
@@ -54,7 +54,7 @@ public class JobAdvertisedSaveReqVO {
     private BigDecimal payTo;
 
     @Schema(description = "薪酬单位")
-    private Integer payUnit;
+    private String payUnit;
 
     @Schema(description = "职位标签")
     private List<String> tagList;
@@ -75,6 +75,6 @@ public class JobAdvertisedSaveReqVO {
     private String latitude;
 
     @Schema(description = "职位状态", example = "2")
-    private Integer status;
+    private String status;
 
 }

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/vo/JobInterestedPageReqVO.java

@@ -20,7 +20,7 @@ public class JobInterestedPageReqVO extends PageParam {
     private Long userId;
 
     @Schema(description = "求职类型(0全职 1兼职 2临时 3实习)", example = "2")
-    private Integer jobType;
+    private String jobType;
 
     @Schema(description = "期望职位", example = "20359")
     private Long positionId;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/vo/JobInterestedRespVO.java

@@ -29,7 +29,7 @@ public class JobInterestedRespVO {
     @Schema(description = "求职类型(0全职 1兼职 2临时 3实习)", example = "2")
     @ExcelProperty(value = "求职类型(0全职 1兼职 2临时 3实习)", converter = DictConvert.class)
     @DictFormat(MENDUNER_JOB_TYPE)
-    private Integer jobType;
+    private String jobType;
 
     @Schema(description = "期望职位", example = "20359")
     @ExcelProperty("期望职位")

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/vo/JobInterestedSaveReqVO.java

@@ -17,7 +17,7 @@ public class JobInterestedSaveReqVO {
     private Long userId;
 
     @Schema(description = "求职类型(0全职 1兼职 2临时 3实习)", example = "2")
-    private Integer jobType;
+    private String jobType;
 
     @Schema(description = "期望职位", example = "20359")
     private Long positionId;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/major/vo/MajorPageReqVO.java

@@ -22,7 +22,7 @@ public class MajorPageReqVO extends PageParam {
     private String nameEn;
 
     @Schema(description = "帐号状态(0正常 1停用)", example = "1")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/major/vo/MajorRespVO.java

@@ -32,7 +32,7 @@ public class MajorRespVO {
     @Schema(description = "帐号状态(0正常 1停用)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty(value = "帐号状态(0正常 1停用)", converter = DictConvert.class)
     @DictFormat(MENDUNER_STATUS)
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/major/vo/MajorSaveReqVO.java

@@ -20,6 +20,6 @@ public class MajorSaveReqVO {
 
     @Schema(description = "状态(0正常 1停用)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "{1_200_018_001}")
-    private Integer status;
+    private String status;
 
 }

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/permission/role/MdeRolePageReqVO.java

@@ -22,7 +22,7 @@ public class MdeRolePageReqVO extends PageParam {
     private String code;
 
     @Schema(description = "展示状态,参见 MendunerStatusEnum 枚举类", example = "1")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/permission/role/MdeRoleRespVO.java

@@ -37,10 +37,10 @@ public class MdeRoleRespVO {
     @Schema(description = "状态,参见 MendunerStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty(value = "角色状态", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.COMMON_STATUS)
-    private Integer status;
+    private String status;
 
     @Schema(description = "角色类型,参见 RoleTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer type;
+    private String type;
 
     @Schema(description = "备注", example = "我是一个角色")
     private String remark;

+ 6 - 6
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/info/PersonInfoPageReqVO.java

@@ -25,7 +25,7 @@ public class PersonInfoPageReqVO extends PageParam {
     private String name;
 
     @Schema(description = "用户性别")
-    private Integer sex;
+    private String sex;
 
     @Schema(description = "头像地址")
     private String avatar;
@@ -44,16 +44,16 @@ public class PersonInfoPageReqVO extends PageParam {
     private LocalDateTime birthday;
 
     @Schema(description = "婚姻状况(0未婚 1已婚 2离异 3保密)", example = "1")
-    private Integer maritalStatus;
+    private String maritalStatus;
 
     @Schema(description = "现居住地", example = "8366")
     private Long areaId;
 
     @Schema(description = "求职类型(0全职 1兼职 2临时 3实习)", example = "1")
-    private Integer jobType;
+    private String jobType;
 
     @Schema(description = "求职状态(0离职-随时到岗 1在职-月内到岗 2在职-考虑机会 3在职-暂不考虑)", example = "1")
-    private Integer jobStatus;
+    private String jobStatus;
 
     @Schema(description = "首次工作时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
@@ -63,10 +63,10 @@ public class PersonInfoPageReqVO extends PageParam {
     private String advantage;
 
     @Schema(description = "工作经验", example = "1")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历", example = "2")
-    private Integer eduType;
+    private String eduType;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 6 - 6
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/info/PersonInfoRespVO.java

@@ -26,7 +26,7 @@ public class PersonInfoRespVO {
 
     @Schema(description = "用户性别")
     @ExcelProperty("用户性别")
-    private Integer sex;
+    private String sex;
 
     @Schema(description = "头像地址")
     @ExcelProperty("头像地址")
@@ -50,7 +50,7 @@ public class PersonInfoRespVO {
 
     @Schema(description = "婚姻状况(0未婚 1已婚 2离异 3保密)", example = "1")
     @ExcelProperty("婚姻状况(0未婚 1已婚 2离异 3保密)")
-    private Integer maritalStatus;
+    private String maritalStatus;
 
     @Schema(description = "现居住地", example = "8366")
     @ExcelProperty("现居住地")
@@ -58,11 +58,11 @@ public class PersonInfoRespVO {
 
     @Schema(description = "求职类型(0全职 1兼职 2临时 3实习)", example = "1")
     @ExcelProperty("求职类型(0全职 1兼职 2临时 3实习)")
-    private Integer jobType;
+    private String jobType;
 
     @Schema(description = "求职状态(0离职-随时到岗 1在职-月内到岗 2在职-考虑机会 3在职-暂不考虑)", example = "1")
     @ExcelProperty("求职状态(0离职-随时到岗 1在职-月内到岗 2在职-考虑机会 3在职-暂不考虑)")
-    private Integer jobStatus;
+    private String jobStatus;
 
     @Schema(description = "首次工作时间")
     @ExcelProperty("首次工作时间")
@@ -74,11 +74,11 @@ public class PersonInfoRespVO {
 
     @Schema(description = "工作经验", example = "1")
     @ExcelProperty("工作经验")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历", example = "2")
     @ExcelProperty("学历")
-    private Integer eduType;
+    private String eduType;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

+ 6 - 6
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/info/PersonInfoSaveReqVO.java

@@ -22,7 +22,7 @@ public class PersonInfoSaveReqVO {
     private String name;
 
     @Schema(description = "用户性别")
-    private Integer sex;
+    private String sex;
 
     @Schema(description = "头像地址")
     private String avatar;
@@ -41,16 +41,16 @@ public class PersonInfoSaveReqVO {
     private LocalDateTime birthday;
 
     @Schema(description = "婚姻状况(0未婚 1已婚 2离异 3保密)", example = "1")
-    private Integer maritalStatus;
+    private String maritalStatus;
 
     @Schema(description = "现居住地", example = "8366")
     private Long areaId;
 
     @Schema(description = "求职类型(0全职 1兼职 2临时 3实习)", example = "1")
-    private Integer jobType;
+    private String jobType;
 
     @Schema(description = "求职状态(0离职-随时到岗 1在职-月内到岗 2在职-考虑机会 3在职-暂不考虑)", example = "1")
-    private Integer jobStatus;
+    private String jobStatus;
 
     @Schema(description = "首次工作时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
@@ -60,8 +60,8 @@ public class PersonInfoSaveReqVO {
     private String advantage;
 
     @Schema(description = "工作经验", example = "1")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历", example = "2")
-    private Integer eduType;
+    private String eduType;
 }

+ 7 - 7
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/record/PersonBrowseRecordPageReqVO.java

@@ -40,13 +40,13 @@ public class PersonBrowseRecordPageReqVO extends PageParam {
     private String jobName;
 
     @Schema(description = "招聘类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "工作经验", example = "1")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历要求", example = "2")
-    private Integer eduType;
+    private String eduType;
 
     @Schema(description = "薪酬from")
     private BigDecimal payFrom;
@@ -55,10 +55,10 @@ public class PersonBrowseRecordPageReqVO extends PageParam {
     private BigDecimal payTo;
 
     @Schema(description = "薪酬单位")
-    private Integer payUnit;
+    private String payUnit;
 
     @Schema(description = "货币类型", example = "1")
-    private Integer currencyType;
+    private String currencyType;
 
     @Schema(description = "联系用户id", example = "10787")
     private Long contactUserId;
@@ -76,10 +76,10 @@ public class PersonBrowseRecordPageReqVO extends PageParam {
     private Long industryId;
 
     @Schema(description = "企业融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)", example = "2")
-    private Integer financingStatus;
+    private String financingStatus;
 
     @Schema(description = "企业人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)")
-    private Integer scale;
+    private String scale;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 7 - 7
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/record/PersonBrowseRecordRespVO.java

@@ -47,15 +47,15 @@ public class PersonBrowseRecordRespVO {
 
     @Schema(description = "招聘类型", example = "2")
     @ExcelProperty("招聘类型")
-    private Integer type;
+    private String type;
 
     @Schema(description = "工作经验", example = "1")
     @ExcelProperty("工作经验")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历要求", example = "2")
     @ExcelProperty("学历要求")
-    private Integer eduType;
+    private String eduType;
 
     @Schema(description = "薪酬from")
     @ExcelProperty("薪酬from")
@@ -67,11 +67,11 @@ public class PersonBrowseRecordRespVO {
 
     @Schema(description = "薪酬单位")
     @ExcelProperty("薪酬单位")
-    private Integer payUnit;
+    private String payUnit;
 
     @Schema(description = "货币类型", example = "1")
     @ExcelProperty("货币类型")
-    private Integer currencyType;
+    private String currencyType;
 
     @Schema(description = "职位标签", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("职位标签")
@@ -99,11 +99,11 @@ public class PersonBrowseRecordRespVO {
 
     @Schema(description = "企业融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)", example = "2")
     @ExcelProperty("企业融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)")
-    private Integer financingStatus;
+    private String financingStatus;
 
     @Schema(description = "企业人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)")
     @ExcelProperty("企业人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)")
-    private Integer scale;
+    private String scale;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

+ 7 - 7
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/record/PersonBrowseRecordSaveReqVO.java

@@ -38,13 +38,13 @@ public class PersonBrowseRecordSaveReqVO {
     private String jobName;
 
     @Schema(description = "招聘类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "工作经验", example = "1")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历要求", example = "2")
-    private Integer eduType;
+    private String eduType;
 
     @Schema(description = "薪酬from")
     private BigDecimal payFrom;
@@ -53,10 +53,10 @@ public class PersonBrowseRecordSaveReqVO {
     private BigDecimal payTo;
 
     @Schema(description = "薪酬单位")
-    private Integer payUnit;
+    private String payUnit;
 
     @Schema(description = "货币类型", example = "1")
-    private Integer currencyType;
+    private String currencyType;
 
     @Schema(description = "职位标签", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "{1_100_009_002}")
@@ -78,9 +78,9 @@ public class PersonBrowseRecordSaveReqVO {
     private Long industryId;
 
     @Schema(description = "企业融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)", example = "2")
-    private Integer financingStatus;
+    private String financingStatus;
 
     @Schema(description = "企业人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)")
-    private Integer scale;
+    private String scale;
 
 }

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/skill/PersonSkillPageReqVO.java

@@ -21,7 +21,7 @@ public class PersonSkillPageReqVO extends PageParam {
     private String skillId;
 
     @Schema(description = "技能等级(0一般 1良好 2熟练 3 精通)")
-    private Integer level;
+    private String level;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/skill/PersonSkillSaveReqVO.java

@@ -20,6 +20,6 @@ public class PersonSkillSaveReqVO {
     private String skillId;
 
     @Schema(description = "技能等级(0一般 1良好 2熟练 3 精通)")
-    private Integer level;
+    private String level;
 
 }

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/school/vo/SchoolPageReqVO.java

@@ -43,7 +43,7 @@ public class SchoolPageReqVO extends PageParam {
     private String latitude;
 
     @Schema(description = "帐号状态(0正常 1停用)", example = "2")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/school/vo/SchoolRespVO.java

@@ -55,7 +55,7 @@ public class SchoolRespVO {
 
     @Schema(description = "帐号状态(0正常 1停用)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("帐号状态(0正常 1停用)")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/school/vo/SchoolSaveReqVO.java

@@ -41,6 +41,6 @@ public class SchoolSaveReqVO {
 
     @Schema(description = "帐号状态(0正常 1停用)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "{1_200_018_001}")
-    private Integer status;
+    private String status;
 
 }

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/vo/MdeUserPageReqVO.java

@@ -27,7 +27,7 @@ public class MdeUserPageReqVO extends PageParam {
     private String phone;
 
     @Schema(description = "帐号状态(0正常 1停用)", example = "2")
-    private Integer status;
+    private String status;
 
     @Schema(description = "最后登录IP")
     private String loginIp;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/vo/MdeUserRespVO.java

@@ -44,7 +44,7 @@ public class MdeUserRespVO {
     @Schema(description = "帐号状态(0正常 1停用)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty(value = "帐号状态(0正常 1停用)", converter = DictConvert.class)
     @DictFormat(MENDUNER_STATUS)
-    private Integer status;
+    private String status;
 
     @Schema(description = "注册 IP")
     @ExcelProperty("注册 IP")
@@ -52,7 +52,7 @@ public class MdeUserRespVO {
 
     @Schema(description = "注册终端")
     @ExcelProperty("注册终端")
-    private Integer registerTerminal;
+    private String registerTerminal;
 
     @Schema(description = "最后登录IP")
     @ExcelProperty("最后登录IP")

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/vo/MdeUserSaveReqVO.java

@@ -34,13 +34,13 @@ public class MdeUserSaveReqVO {
 
     @Schema(description = "帐号状态(0正常 1停用)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "{1_200_018_001}")
-    private Integer status;
+    private String status;
 
     @Schema(description = "注册 IP")
     private String registerIp;
 
     @Schema(description = "注册终端")
-    private Integer registerTerminal;
+    private String registerTerminal;
 
     @Schema(description = "最后登录IP")
     private String loginIp;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/vo/MdeUserUpdateStatusReqVO.java

@@ -18,6 +18,6 @@ public class MdeUserUpdateStatusReqVO {
     @Schema(description = "状态,见 MendunerStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "{1_200_018_001}")
     @InEnum(value = MendunerStatusEnum.class, message = "{1_200_018_002}")
-    private Integer status;
+    private String status;
 
 }

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/visits/vo/MdeVisitsListReqVO.java

@@ -19,7 +19,7 @@ import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DA
 public class MdeVisitsListReqVO {
 
     @Schema(description = "业务类型")
-    private Integer type;
+    private String type;
 
     @Schema(description = "业务id")
     private Long bizId;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/visits/vo/MdeVisitsPageReqVO.java

@@ -18,7 +18,7 @@ import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DA
 public class MdeVisitsPageReqVO extends PageParam {
 
     @Schema(description = "业务类型")
-    private Integer type;
+    private String type;
 
     @Schema(description = "业务id")
     private Long bizId;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/visits/vo/MdeVisitsRespVO.java

@@ -26,7 +26,7 @@ public class MdeVisitsRespVO {
     @Schema(description = "业务类型")
     @ExcelProperty(value = "业务类型", converter = DictConvert.class)
     @DictFormat(MENDUNER_VISITS_TYPE)
-    private Integer type;
+    private String type;
 
     @Schema(description = "业务id")
     @ExcelProperty("业务id")

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/visits/vo/MdeVisitsSaveReqVO.java

@@ -22,7 +22,7 @@ public class MdeVisitsSaveReqVO {
     private Long id;
 
     @Schema(description = "业务类型")
-    private Integer type;
+    private String type;
 
     @Schema(description = "业务id")
     private Long bizId;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/workexp/vo/WorkExpPageReqVO.java

@@ -49,10 +49,10 @@ public class WorkExpPageReqVO extends PageParam {
     private LocalDateTime endTime;
 
     @Schema(description = "薪酬类型(0月薪 1年薪)", example = "1")
-    private Integer payUnit;
+    private String payUnit;
 
     @Schema(description = "货币类型", example = "2")
-    private Integer currencyType;
+    private String currencyType;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/workexp/vo/WorkExpRespVO.java

@@ -76,12 +76,12 @@ public class WorkExpRespVO {
     @Schema(description = "薪酬类型(0月薪 1年薪)", example = "1")
     @ExcelProperty(value = "薪酬类型(0月薪 1年薪)", converter = DictConvert.class)
     @DictFormat(MENDUNER_PAY_TYPE)
-    private Integer payUnit;
+    private String payUnit;
 
     @Schema(description = "货币类型", example = "2")
     @ExcelProperty(value = "货币类型", converter = DictConvert.class)
     @DictFormat(MENDUNER_CURRENCY_TYPE)
-    private Integer currencyType;
+    private String currencyType;
 
     @Schema(description = "技能")
     @ExcelProperty("技能")

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/workexp/vo/WorkExpSaveReqVO.java

@@ -58,10 +58,10 @@ public class WorkExpSaveReqVO {
     private BigDecimal pay;
 
     @Schema(description = "薪酬类型(0月薪 1年薪)", example = "1")
-    private Integer payUnit;
+    private String payUnit;
 
     @Schema(description = "货币类型", example = "2")
-    private Integer currencyType;
+    private String currencyType;
 
     @Schema(description = "技能")
     private String skillList;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaChildrenRespVO.java

@@ -20,7 +20,7 @@ public class AppAreaChildrenRespVO {
     private String name;
 
     @Schema(description = "区域类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "上级区域", example = "9103")
     private Long parentId;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaListReqVO.java

@@ -16,7 +16,7 @@ public class AppAreaListReqVO {
     private String name;
 
     @Schema(description = "区域类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "父级编号", example = "6080")
     private Long parentId;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaSimpleRespVO.java

@@ -19,7 +19,7 @@ public class AppAreaSimpleRespVO {
     private String name;
 
     @Schema(description = "区域类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "父级编号", example = "6080")
     private Long parentId;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppHotAreaRespVO.java

@@ -14,7 +14,7 @@ public class AppHotAreaRespVO {
     private String name;
 
     @Schema(description = "区域类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "顺序", example = "1")
     private Integer sort;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/AppMdeAuthController.java

@@ -96,7 +96,7 @@ public class AppMdeAuthController {
             @Parameter(name = "type", description = "社交类型", required = true),
             @Parameter(name = "redirectUri", description = "回调路径")
     })
-    public CommonResult<String> socialAuthRedirect(@RequestParam("type") Integer type,
+    public CommonResult<String> socialAuthRedirect(@RequestParam("type") String type,
                                                    @RequestParam("redirectUri") String redirectUri) {
         return CommonResult.success(authService.getSocialAuthorizeUrl(type, redirectUri));
     }

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/contact/AppEnterpriseUserContactRespVO.java

@@ -17,13 +17,13 @@ public class AppEnterpriseUserContactRespVO {
     private String name;
 
     @Schema(description = "用户性别")
-    private Integer sex;
+    private String sex;
 
     @Schema(description = "头像地址")
     private String avatar;
 
     @Schema(description = "状态,是否在线", example = "0")
-    private Integer status;
+    private String status;
 
     @Schema(description = "岗位中文名称", example = "人事")
     private String postNameCn;

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseRespVO.java

@@ -45,10 +45,10 @@ public class AppEnterpriseRespVO {
     private Long industryId;
 
     @Schema(description = "融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)", example = "2")
-    private Integer financingStatus;
+    private String financingStatus;
 
     @Schema(description = "人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)")
-    private Integer scale;
+    private String scale;
 
     @Schema(description = "公司福利")
     private List<String> welfareList;
@@ -66,7 +66,7 @@ public class AppEnterpriseRespVO {
     private String receivedHonors;
 
     @Schema(description = "状态(0正常 1停用)")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     private LocalDateTime createTime;

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseSearchPageReqVO.java

@@ -17,14 +17,14 @@ public class AppEnterpriseSearchPageReqVO extends PageParam {
     private List<Long> areaIds;
 
     @Schema(description = "企业类型(menduner_enterprise_type)", example = "[]")
-    private Integer enterpriseType;
+    private String enterpriseType;
 
     @Schema(description = "行业信息id集合", example = "[]")
     private List<Long> industryIds;
 
     @Schema(description = "人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)", example = "1")
-    private Integer scale;
+    private String scale;
 
     @Schema(description = "融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)",  example = "1")
-    private Integer financingStatus;
+    private String financingStatus;
 }

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseSimpleRespVO.java

@@ -23,10 +23,10 @@ public class AppEnterpriseSimpleRespVO {
     private Long industryId;
 
     @Schema(description = "人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)", example = "1")
-    private Integer scale;
+    private String scale;
 
     @Schema(description = "融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)", example = "1")
-    private Integer financingStatus;
+    private String financingStatus;
 
     @Schema(description = "企业logo地址", example = "https://www.menduner.com/static/img/loginlogo2.7924c12.png")
     private String logoUrl;

+ 5 - 5
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedDetailRespVO.java

@@ -33,13 +33,13 @@ public class AppJobAdvertisedDetailRespVO {
     private Long positionId;
 
     @Schema(description = "招聘类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "工作经验", example = "1")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历要求", example = "1")
-    private Integer eduType;
+    private String eduType;
 
     @Schema(description = "薪酬from")
     private BigDecimal payFrom;
@@ -48,7 +48,7 @@ public class AppJobAdvertisedDetailRespVO {
     private BigDecimal payTo;
 
     @Schema(description = "薪酬单位")
-    private Integer payUnit;
+    private String payUnit;
 
     @Schema(description = "职位标签")
     private List<String> tagList;
@@ -69,7 +69,7 @@ public class AppJobAdvertisedDetailRespVO {
     private String latitude;
 
     @Schema(description = "职位状态", example = "2")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     private LocalDateTime createTime;

+ 4 - 4
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedPageReqVO.java

@@ -35,13 +35,13 @@ public class AppJobAdvertisedPageReqVO extends PageParam {
     private Long positionId;
 
     @Schema(description = "招聘类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "工作经验", example = "1")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历要求", example = "1")
-    private Integer eduType;
+    private String eduType;
 
     @Schema(description = "职位标签")
     private List<String> tagList;
@@ -53,7 +53,7 @@ public class AppJobAdvertisedPageReqVO extends PageParam {
     private String requirement;
 
     @Schema(description = "职位状态", example = "2")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedRespVO.java

@@ -18,7 +18,7 @@ public class AppJobAdvertisedRespVO extends AppJobAdvertisedSimpleRespVO {
     private Long industryId;
 
     @Schema(description = "人员规模(menduner_scale)", example = "1")
-    private Integer scale;
+    private String scale;
 
     @Schema(description = "企业logo地址", example = "https://www.menduner.com/static/img/loginlogo2.7924c12.png")
     private String logoUrl;

+ 7 - 7
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedSearchPageReqVO.java

@@ -24,16 +24,16 @@ public class AppJobAdvertisedSearchPageReqVO extends PageParam {
     private List<Long> areaIds;
 
     @Schema(description = "工作经验(menduner_exp_type)",  example = "[]")
-    private List<Integer> expType;
+    private List<String> expType;
 
     @Schema(description = "学历要求(menduner_education_type)", example = "[]")
-    private List<Integer> eduType;
+    private List<String> eduType;
 
     @Schema(description = "薪酬待遇范围(menduner_pay_scope)",  example = "[]")
-    private List<Integer> payType;
+    private List<String> payType;
 
     @Schema(description = "求职类型(menduner_job_type)", example = "[]")
-    private List<Integer> jobType;
+    private List<String> jobType;
 
     @Schema(description = "职位类型", example = "2")
     private Long positionId;
@@ -44,15 +44,15 @@ public class AppJobAdvertisedSearchPageReqVO extends PageParam {
     private Long enterpriseId;
 
     @Schema(description = "企业类型(menduner_enterprise_type)", example = "[]")
-    private List<Integer> enterpriseType;
+    private List<String> enterpriseType;
 
     @Schema(description = "行业信息id集合", example = "[]")
     private List<Long> industryIds;
 
     @Schema(description = "人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)", example = "1")
-    private List<Integer> scale;
+    private List<String> scale;
 
     @Schema(description = "融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)",  example = "1")
-    private List<Integer> financingStatus;
+    private List<String> financingStatus;
 
 }

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedSimpleRespVO.java

@@ -27,16 +27,16 @@ public class AppJobAdvertisedSimpleRespVO {
     private BigDecimal payTo;
 
     @Schema(description = "薪酬单位(menduner_pay_unit)", example = "月/年")
-    private Integer payUnit;
+    private String payUnit;
 
     @Schema(description = "工作地区id", example = "110000")
     private Long areaId;
 
     @Schema(description = "工作经验(menduner_exp_type)", example = "1")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历要求(menduner_education_type)", example = "1")
-    private Integer eduType;
+    private String eduType;
 
     @Schema(description = "职位标签", example = "[xx,xx]")
     private List<String> tagList;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/eduexp/AppEduExpRespVO.java

@@ -23,10 +23,10 @@ public class AppEduExpRespVO {
     private String schoolName;
 
     @Schema(description = "学历(0初中及以下 | 1中专/中技 | 2高中 | 3大专 | 4 本科 5 硕士 6 博士 99 其他)", example = "2")
-    private Integer educationType;
+    private String educationType;
 
     @Schema(description = "学制类型(0 全日制 | 1 非全日制)", example = "1")
-    private Integer educationSystemType;
+    private String educationSystemType;
 
     @Schema(description = "专业id", example = "30649")
     private Long majorId;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/eduexp/AppEduExpSaveReqVO.java

@@ -24,11 +24,11 @@ public class AppEduExpSaveReqVO {
 
     @NotNull(message = "{1_100_006_002}")
     @Schema(description = "学历(0初中及以下 | 1中专/中技 | 2高中 | 3大专 | 4 本科 5 硕士 6 博士 99 其他)", example = "2")
-    private Integer educationType;
+    private String educationType;
 
     @NotNull(message = "{1_100_006_003}")
     @Schema(description = "学制类型(0 全日制 | 1 非全日制)", example = "1")
-    private Integer educationSystemType;
+    private String educationSystemType;
 
     @Schema(description = "专业id", example = "30649")
     private Long majorId;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/job/AppJobInterestedRespVO.java

@@ -17,7 +17,7 @@ public class AppJobInterestedRespVO {
     private Long id;
 
     @Schema(description = "求职类型(0全职 1兼职 2临时 3实习)", example = "2")
-    private Integer jobType;
+    private String jobType;
 
     @Schema(description = "期望职位", example = "20359")
     private Long positionId;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/job/AppJobInterestedSaveReqVO.java

@@ -24,7 +24,7 @@ public class AppJobInterestedSaveReqVO {
 
     @NotNull(message = "{1_100_007_004}")
     @Schema(description = "求职类型(0全职 1兼职 2临时 3实习)", example = "2")
-    private Integer jobType;
+    private String jobType;
 
     @NotNull(message = "{1_100_007_005}")
     @Schema(description = "薪酬最低要求")

+ 4 - 4
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/resume/AppPersonInfoSaveReqVO.java

@@ -19,7 +19,7 @@ public class AppPersonInfoSaveReqVO {
     private String name;
 
     @Schema(description = "用户性别")
-    private Integer sex;
+    private String sex;
 
     @Schema(description = "头像地址")
     private String avatar;
@@ -38,18 +38,18 @@ public class AppPersonInfoSaveReqVO {
     private LocalDateTime birthday;
 
     @Schema(description = "婚姻状况(0未婚 1已婚 2离异 3保密)", example = "1")
-    private Integer maritalStatus;
+    private String maritalStatus;
 
     @NotNull(message = "{1_100_001_009}")
     @Schema(description = "所在城市", example = "8366")
     private Long areaId;
 
     @Schema(description = "求职类型(0全职 1兼职 2临时 3实习)", example = "1")
-    private Integer jobType;
+    private String jobType;
 
     @NotNull(message = "{1_100_001_008}")
     @Schema(description = "求职状态(0离职-随时到岗 1在职-月内到岗 2在职-考虑机会 3在职-暂不考虑)", example = "1")
-    private Integer jobStatus;
+    private String jobStatus;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     @Schema(description = "首次工作时间")

+ 7 - 7
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/vo/AppPersonBrowseRecordPageRespVO.java

@@ -35,13 +35,13 @@ public class AppPersonBrowseRecordPageRespVO {
     private String jobName;
 
     @Schema(description = "招聘类型", example = "2")
-    private Integer type;
+    private String type;
 
     @Schema(description = "工作经验", example = "1")
-    private Integer expType;
+    private String expType;
 
     @Schema(description = "学历要求", example = "2")
-    private Integer eduType;
+    private String eduType;
 
     @Schema(description = "薪酬from")
     private BigDecimal payFrom;
@@ -50,10 +50,10 @@ public class AppPersonBrowseRecordPageRespVO {
     private BigDecimal payTo;
 
     @Schema(description = "薪酬单位")
-    private Integer payUnit;
+    private String payUnit;
 
     @Schema(description = "货币类型", example = "1")
-    private Integer currencyType;
+    private String currencyType;
 
     @Schema(description = "职位标签")
     private String tagList;
@@ -74,10 +74,10 @@ public class AppPersonBrowseRecordPageRespVO {
     private Long industryId;
 
     @Schema(description = "企业融资阶段(menduner_financing_status)", example = "2")
-    private Integer financingStatus;
+    private String financingStatus;
 
     @Schema(description = "企业人员规模(menduner_scale)")
-    private Integer scale;
+    private String scale;
 
     @Schema(description = "创建时间")
     private LocalDateTime createTime;

Some files were not shown because too many files changed in this diff