Pārlūkot izejas kodu

更改代码结构

lzu918 7 mēneši atpakaļ
vecāks
revīzija
33f364a3cb

+ 1 - 1
ruoyi-admin/pom.xml

@@ -61,7 +61,7 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
-        <!-- 业务模块依赖-->
+        <!-- 增加- 业务模块依赖-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-zzb</artifactId>

+ 1 - 1
ruoyi-admin/src/main/resources/application-druid.yml

@@ -15,7 +15,7 @@ spring:
                 password: 123
             # 从库数据源
             slave:
-                # 从数据源开关/默认关闭
+                # 从数据源开关/默认关闭       增加--多数据源
 #                enabled: true
                 enabled: false   # 测试时关闭
                 url: jdbc:mysql://localhost:3306/person?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8

+ 1 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -116,7 +116,7 @@ public class SecurityConfig
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                     .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
 
-                    // *** 解决401认证问题,在这里对自定义业务模块中对应的资源请求路径放行 ***
+                    // *** 解决401认证问题,在这里对自定义业务模块中对应的资源请求路径放行  增加--放行url ***
                     .antMatchers("/user/**").permitAll()
                     // 除上面外的所有请求全部需要鉴权认证
                     .anyRequest().authenticated();

+ 4 - 0
ruoyi-zzb/pom.xml

@@ -24,6 +24,10 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 
     </dependencies>
 

+ 5 - 5
ruoyi-zzb/src/main/java/com/ruoyi/zzb/controller/UserController.java → ruoyi-zzb/src/main/java/com/ruoyi/zzb/demo/controller/UserController.java

@@ -1,9 +1,9 @@
-package com.ruoyi.zzb.controller;
+package com.ruoyi.zzb.demo.controller;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.zzb.domain.User;
-import com.ruoyi.zzb.mapper.UserMapper;
+import com.ruoyi.zzb.demo.domain.User;
+import com.ruoyi.zzb.demo.mapper.UserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,13 +17,13 @@ public class UserController {
     private UserMapper userMapper;
 
     @GetMapping( "/getUserById")
-    @DataSource(value = DataSourceType.MASTER)
+    @DataSource(value = DataSourceType.MASTER)      //指定
     public User getUserById(int id){
         return userMapper.selectById(id);
     }
 
     @GetMapping( "/getUserById2")
-    @DataSource(value = DataSourceType.SLAVE)
+    @DataSource(value = DataSourceType.SLAVE)        //指定
     public User getUserById2(int id){
         return userMapper.selectById(id);
     }

+ 26 - 0
ruoyi-zzb/src/main/java/com/ruoyi/zzb/demo/domain/User.java

@@ -0,0 +1,26 @@
+package com.ruoyi.zzb.demo.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("t_user")
+public class User {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private int id;
+
+    @TableField(value = "user_id")
+    private String username;
+    @TableField
+    private String password;
+
+    public User() {
+    }
+
+}

+ 2 - 4
ruoyi-zzb/src/main/java/com/ruoyi/zzb/mapper/UserMapper.java → ruoyi-zzb/src/main/java/com/ruoyi/zzb/demo/mapper/UserMapper.java

@@ -1,9 +1,7 @@
-package com.ruoyi.zzb.mapper;
+package com.ruoyi.zzb.demo.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.zzb.domain.User;
+import com.ruoyi.zzb.demo.domain.User;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 1 - 1
ruoyi-zzb/src/main/java/com/ruoyi/zzb/service/UserService.java → ruoyi-zzb/src/main/java/com/ruoyi/zzb/demo/service/UserService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.zzb.service;
+package com.ruoyi.zzb.demo.service;
 
 import org.springframework.stereotype.Service;
 

+ 0 - 55
ruoyi-zzb/src/main/java/com/ruoyi/zzb/domain/User.java

@@ -1,55 +0,0 @@
-package com.ruoyi.zzb.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-@TableName("t_user")
-public class User {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(type = IdType.AUTO)
-    private int id;
-    @TableField
-    private String username;
-    @TableField
-    private String password;
-
-    public User() {
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", username='" + username + '\'' +
-                ", password='" + password + '\'' +
-                '}';
-    }
-}

+ 1 - 1
ruoyi-zzb/src/main/resources/mapper/UserMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.zzb.mapper.UserMapper">
+<mapper namespace="com.ruoyi.zzb.module1.mapper.UserMapper">
 
 	<!--<resultMap type="User" id="UserResult">
 	    <id property="id" column="id" />