aa

VisualInspection/js/user/addUser.js

@@ -92,7 +92,7 @@ function initUserInfo() {
         });
         $img0.attr("src", "/js/lib/imageupload/img/a7.png").appendTo($section);
         var $img = $("<img class='up-img up-opcity' id='user_pic'>");
-        $img.attr("src", base_server_url + usertemp.pic);
+        $img.attr("src", usertemp.pic);
         $img.appendTo($section);
         var $p = $("<p class='img-name-p'>");
         $p.html("image").appendTo($section);

VisualInspection_server/src/main/java/com/xintong/VideocheckApplication.java

@@ -1,5 +1,6 @@
 package com.xintong;
 
+import org.apache.ibatis.logging.LogFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
@@ -21,6 +22,7 @@ public class VideocheckApplication {
 		ParserConfig.getGlobalInstance().addAccept("com.xintong.");
 		ParserConfig.getGlobalInstance().addAccept("org.springframework.security.core.");
 
+		LogFactory.useLog4JLogging();
         SpringApplication.run(VideocheckApplication.class, args);
 	}
 }

VisualInspection_server/src/main/java/com/xintong/system/securityTools/WebSecurityConfig.java

@@ -66,7 +66,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                  "/**/*.js"
          ).permitAll()
          // 对于获取token的rest api要允许匿名访问
-         .antMatchers("/user/auth/**","/file/**").permitAll()
+         .antMatchers("/user/auth/**","/file/**","/druid/**").permitAll()
          // 除上面外的所有请求全部需要鉴权认证
          .anyRequest().authenticated();
     	

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/RoleController.java

@@ -31,6 +31,7 @@ public class RoleController extends BaseController {
 
 	@Autowired
 	private RoleService roleService;
+	
 
 	/**
 	 * 添加角色
@@ -112,6 +113,8 @@ public class RoleController extends BaseController {
 		try {
 			PageHelper.startPage(page, size);
 			List<RoleData> roles = roleService.getRoleDatas(new Role());
+			
+			
 
 			return returnResult(0, "获取成功", new PageInfo(roles));
 		} catch (Exception e) {

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/UserController.java

@@ -17,6 +17,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
 import com.xintong.system.securityTools.RedisCacheUtil;
+import com.xintong.visualinspection.bean.Role;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.AuthService;
 import com.xintong.visualinspection.service.RoleService;
@@ -110,6 +111,7 @@ public class UserController extends BaseController {
         		user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
         	}
         	if(user.getRoleids()!=null){
+        		roleService.roleUnBindUser(user.getId());
         		for(String id:user.getRoleids()){
         			roleService.roleBindUser(Integer.parseInt(id), user.getId());
         		}

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/RoleDao.java

@@ -31,4 +31,6 @@ public interface RoleDao  {
     
     public List<RoleData> getRolesCount(Role role);
     
+    public void roleUnBindUser(Integer userId);
+    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/UserInfoMapper.xml

@@ -45,7 +45,13 @@
         SET
         <if test="username != null">username = #{username},</if>
         <if test="age != null">age = #{age},</if>
+        <if test="organid != null">ORGANID = #{organid},</if>
         <if test="password != null">password = #{password},</if>
+        <if test="truename != null">TRUENAME = #{truename},</if>
+        <if test="workno != null">workno = #{workno},</if>
+        <if test="mobile != null">mobile = #{mobile},</if>
+        <if test="idno != null">idno = #{idno},</if>
+        <if test="positionid != null">positionid = #{positionid},</if>
         <if test="pic != null">pic = #{pic},</if>
         id = #{id}
         WHERE

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/RoleMapper.xml

@@ -59,7 +59,9 @@
         id =#{id}
     </delete>
     
-    
+    <delete id="roleUnBindUser" parameterType="java.lang.Integer" >
+        delete from sys_role_user where sys_user_id = #{userId,jdbcType=INTEGER}
+    </delete>
     
     
     <insert id="roleBindPermission" parameterType="java.util.Map">

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/UserMapper.xml

@@ -42,6 +42,7 @@
         sys_user
         SET
         <if test="username != null">userName = #{username},</if>
+        <if test="organid != null and organid != 0">ORGANID = #{organid},</if>
         <if test="age != null">age = #{age},</if>
         <if test="password != null">password = #{password},</if>
         id = #{id}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/RoleService.java

@@ -32,4 +32,6 @@ public interface RoleService {
 
 	public List<Role> getRoleByPosition(Integer positionId);
 	public List<RoleData> getRoleDatas(Role role);
+	
+	public void roleUnBindUser(Integer userId);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/RoleServiceImpl.java

@@ -8,7 +8,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.xintong.visualinspection.bean.Permission;
 import com.xintong.visualinspection.bean.Role;
+import com.xintong.visualinspection.dao.master.PermissionDao;
 import com.xintong.visualinspection.dao.master.RoleDao;
 import com.xintong.visualinspection.pojo.RoleData;
 import com.xintong.visualinspection.service.BaseService;
@@ -26,6 +28,9 @@ public class RoleServiceImpl extends BaseService implements RoleService {
 
     @Autowired
     private RoleDao roleDao;
+    
+    @Autowired
+    private PermissionDao permissionDao;
 
 
 	@Override
@@ -112,5 +117,12 @@ public class RoleServiceImpl extends BaseService implements RoleService {
 		return roleDao.getRolesCount(role);
 	}
 
+
+	@Override
+	public void roleUnBindUser(Integer userId) {
+		roleDao.roleUnBindUser(userId);
+		
+	}
+
     
 }

VisualInspection_server/src/main/resources/application.properties

@@ -68,11 +68,11 @@ spring.redis.timeout=0
 
 
 
-logging.level.root=INFO
+logging.level.root=DEBUG
 logging.level.org.springframework.web=DEBUG
 logging.level.org.springframework.data=DEBUG
 logging.level.org.springframework.security=DEBUG
-logging.level.org.mybites=INFO
+logging.level.org.mybites=DEBUG