Merge remote-tracking branch 'origin/dev' into dev

nafmii-admin/pom.xml

@@ -47,6 +47,10 @@
             <artifactId>mysql-connector-java</artifactId>
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.20</version>
             <version>8.0.20</version>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
     </dependencies>
     </dependencies>
     <dependencyManagement>
     <dependencyManagement>
         <dependencies>
         <dependencies>

nafmii-app/pom.xml

@@ -36,6 +36,10 @@
             <artifactId>mysql-connector-java</artifactId>
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.20</version>
             <version>8.0.20</version>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
     </dependencies>
     </dependencies>
     <dependencyManagement>
     <dependencyManagement>
         <dependencies>
         <dependencies>

nafmii-app/src/main/resources/mapper/AppUserMapper.xml

@@ -126,13 +126,13 @@
     delete from APP_USER
     delete from APP_USER
     where ID = #{id,jdbcType=BIGINT}
     where ID = #{id,jdbcType=BIGINT}
   </delete>
   </delete>
-  <delete id="deleteByExample" parameterType="org.nafmii.entity.user.AppUserExample">
+  <delete id="deleteByExample" parameterType="org.nafmii.nafmiimbg.model.AppUserExample">
     delete from APP_USER
     delete from APP_USER
     <if test="_parameter != null">
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
       <include refid="Example_Where_Clause" />
     </if>
     </if>
   </delete>
   </delete>
-  <insert id="insert" parameterType="org.nafmii.entity.user.AppUserExample">
+  <insert id="insert" parameterType="org.nafmii.nafmiimbg.model.AppUser">
     insert into APP_USER (ID, USER_NAME, LOGIN_PWD, 
     insert into APP_USER (ID, USER_NAME, LOGIN_PWD, 
       REAL_NAME, PHONE, BIRTHDAY, 
       REAL_NAME, PHONE, BIRTHDAY, 
       EMAIL, HEAD_PICTURE, NATIONALITY, 
       EMAIL, HEAD_PICTURE, NATIONALITY, 
@@ -384,7 +384,7 @@
     </set>
     </set>
     where ID = #{id,jdbcType=BIGINT}
     where ID = #{id,jdbcType=BIGINT}
   </update>
   </update>
-  <update id="updateByPrimaryKey" parameterType="org.nafmii.entity.user.AppUserExample">
+  <update id="updateByPrimaryKey" parameterType="org.nafmii.nafmiimbg.model.AppUser">
     update APP_USER
     update APP_USER
     set USER_NAME = #{userName,jdbcType=VARCHAR},
     set USER_NAME = #{userName,jdbcType=VARCHAR},
       LOGIN_PWD = #{loginPwd,jdbcType=VARCHAR},
       LOGIN_PWD = #{loginPwd,jdbcType=VARCHAR},

nafmii-common/pom.xml

@@ -184,8 +184,9 @@
             <version>2.4</version>
             <version>2.4</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>
 
 

nafmii-common/src/main/java/org/nafmii/utils/SpringUtils.java

@@ -6,7 +6,6 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.servlet.LocaleResolver;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Locale;
 import java.util.Locale;
@@ -37,9 +36,9 @@ public class SpringUtils implements ApplicationContextAware {
         return requestAttrs.getRequest();
         return requestAttrs.getRequest();
     }
     }
 
 
-    public static String getMessage(String code, Object... args) {
-        LocaleResolver localeResolver = getBean(LocaleResolver.class);
-        Locale locale = localeResolver.resolveLocale(getCurrentReq());
-        return applicationContext.getMessage(code, args, locale);
-    }
+//    public static String getMessage(String code, Object... args) {
+//        LocaleResolver localeResolver = getBean(LocaleResolver.class);
+//        Locale locale = localeResolver.resolveLocale(getCurrentReq());
+//        return applicationContext.getMessage(code, args, locale);
+//    }
 }
 }

nafmii-gateway/pom.xml

@@ -31,6 +31,13 @@
                 </exclusion>
                 </exclusion>
             </exclusions>
             </exclusions>
         </dependency>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-webflux -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+            <version>2.3.10.RELEASE</version>
+        </dependency>
+
         <dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <artifactId>spring-boot-starter-test</artifactId>

nafmii-gateway/src/main/java/org/nafmii/NafmiiGatewayApplication.java

@@ -8,7 +8,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 @SpringBootApplication(exclude= {DataSourceAutoConfiguration.class},scanBasePackages={"org.nafmii","org.nafmii.exception"})
 @SpringBootApplication(exclude= {DataSourceAutoConfiguration.class},scanBasePackages={"org.nafmii","org.nafmii.exception"})
 @EnableEurekaClient
 @EnableEurekaClient
 public class NafmiiGatewayApplication {
 public class NafmiiGatewayApplication {
-
     public static void main(String[] args) {
     public static void main(String[] args) {
         SpringApplication.run(NafmiiGatewayApplication.class, args);
         SpringApplication.run(NafmiiGatewayApplication.class, args);
     }
     }

nafmii-mbg/pom.xml

@@ -36,6 +36,11 @@
             <artifactId>mysql-connector-java</artifactId>
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.20</version>
             <version>8.0.20</version>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>org.mybatis.generator</groupId>
+            <artifactId>mybatis-generator-core</artifactId>
+            <version>1.3.6</version>
+        </dependency>
     </dependencies>
     </dependencies>
     <dependencyManagement>
     <dependencyManagement>
         <dependencies>
         <dependencies>