新增注册申请修改

user_auth/src/main/java/com/huaxu/controller/UserController.java

@@ -111,5 +111,18 @@ public class UserController {
     }
 
 
+    /**
+     * 新增一条注册数据
+     *
+     * @param user 实体类
+     * @return Response对象
+     */
+    @RequestMapping(value = "insertRegister", method = RequestMethod.POST)
+    @ApiOperation(value = "插入注册申请")
+    public AjaxMessage<Integer> insertRegister(@ApiParam(value = "注册申请信息", required = true) @RequestBody User user) {
+        int result = userService.insertRegister(user);
+
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
 
 }

user_auth/src/main/java/com/huaxu/dao/UserMapper.java

@@ -90,4 +90,12 @@ public interface UserMapper {
 
 
     List<UserDto> findLoginInfo(UserDto user);
+
+    /**
+     * 新增注册数据
+     * @author yjy
+     * @param user 实例对象
+     * @return 影响行数
+     */
+    int insertRegister(User user);
 }

user_auth/src/main/java/com/huaxu/security/config/ResourceServerConfig.java

@@ -40,7 +40,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .requestMatchers().antMatchers("/**")
                 .and()
                 .authorizeRequests()
-                .antMatchers("/sms/**","/statics/**","/validateCode/image").permitAll()
+                .antMatchers("/sms/**","/statics/**","/validateCode/image","/user/**").permitAll()
                 .antMatchers("/swagger-ui.html","/webjars/**", "/webjars/**", "/swagger-resources/**",
                         "/v2/**"
                         )

user_auth/src/main/java/com/huaxu/service/UserService.java

@@ -85,4 +85,12 @@ public interface UserService {
     List<UserDto> chooseUser(User user);
     boolean logOut(String token);
 
+    /**
+     * 新增注册数据
+     * @author yjy
+     * @param user 实例对象
+     * @return 影响行数
+     */
+    int insertRegister(User user);
+
 }

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -302,4 +302,14 @@ public class UserServiceImpl implements UserService {
         loginLog.setLoginIp(Util.getIpAddr(request));
         loginLogMapper.insert(loginLog);
     }
+    /**
+     * 新增注册数据
+     * @author yjy
+     * @param user 实例对象
+     * @return 影响行数
+     */
+    @Override
+    public int insertRegister(User user) {
+        return this.userMapper.insertRegister(user);
+    }
 }

user_auth/src/main/resources/mapper/UserMapper.xml

@@ -272,4 +272,9 @@
         where a.PHONE=#{phone}
     </select>
 
+    <!-- 新增注册数据 -->
+    <insert id="insertRegister" keyProperty="id" useGeneratedKeys="true">
+        insert into uims_user_register( ID, USERNAME, PHONE, USER_TYPE,	REMARK,	STATUS,	CREATE_BY,DATE_CREATE,UPDATE_BY,DATE_UPDATE)
+        values ( #{id}, #{username}, #{phone}, #{userType}, #{remark}, 1, #{createBy}, #{dateCreate}, #{updateBy}, #{dateUpdate})
+    </insert>
 </mapper>

user_center/src/main/java/com/huaxu/controller/DictController.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.entity.Dict;
 import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
 import com.huaxu.service.DictService;
+import com.huaxu.util.UserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -56,6 +58,10 @@ public class DictController {
     @RequestMapping(value = "insert", method = RequestMethod.POST)
     @ApiOperation(value = "插入数据字典配置列表")
     public AjaxMessage<Integer> insert(@ApiParam(value = "数据字典配置", required = true) @RequestBody Dict dict) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            dict.setCreateBy(currentUser.getUsername());
+        }
         dictService.insert(dict);
         int result =dict.getId();//返回新增数据的id
         return new AjaxMessage<>(ResultStatus.OK, result);
@@ -70,6 +76,10 @@ public class DictController {
     @RequestMapping(value = "update", method = RequestMethod.POST)
     @ApiOperation(value = "修改数据字典配置列表")
     public AjaxMessage<Integer> update(@ApiParam(value = "数据字典配置", required = true) @RequestBody Dict dict) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            dict.setUpdateBy(currentUser.getUsername());
+        }
         int result = dictService.update(dict);
         return new AjaxMessage<>(ResultStatus.OK, result);
 

user_center/src/main/java/com/huaxu/controller/UserRegisterController.java

@@ -71,8 +71,6 @@ public class UserRegisterController {
     /**
      * 分页查询
      *
-     * @param pageNum  偏移
-     * @param pageSize 条数
      * @return Response对象
      */
     @RequestMapping(value = "selectPage", method = RequestMethod.POST)