修改nlp的账号，并登录

xzl-admin/src/main/java/com/xzl/web/controller/system/SysLoginController.java

@@ -53,7 +53,7 @@ public class SysLoginController
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
-        // 登录NLP系统
+        // 登录NLP系统, 能执行到这一步，表示登录成功
         ajax.put("NLPAuthData", userPortraitService.loginNLP(loginBody));
         return ajax;
     }

xzl-admin/src/main/java/com/xzl/web/controller/userPortrait/ViewController.java

@@ -1,6 +1,7 @@
 package com.xzl.web.controller.userPortrait;
 
 import com.xzl.common.utils.DateUtils;
+import com.xzl.common.utils.StringUtils;
 import com.xzl.web.service.UserPortraitService;
 import org.aspectj.util.FileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -144,4 +145,32 @@ public class ViewController {
   public Map initDingtalk() throws Exception {
     return userPortraitService.initByDingtalk();
   }
+
+
+  @PostMapping("/update-nlp")
+  public Map updateNlp(String username, String nlpName, String nlpPwd) throws Exception {
+    Map rs = new HashMap();
+    rs.put("success", 0);
+    if (StringUtils.isBlank(username)) {
+      rs.put("msg", "用户名不能为空");
+      return rs;
+    }
+    if (StringUtils.isBlank(nlpName)) {
+      rs.put("msg", "NLP用户名不能为空");
+      return rs;
+    }
+    if (nlpName.length() > 32) {
+      rs.put("msg", "NLP用户名长度不能超过32");
+      return rs;
+    }
+    if (StringUtils.isBlank(nlpPwd)) {
+      rs.put("msg", "NLP密码不能为空");
+      return rs;
+    }
+    if (nlpPwd.length() > 32) {
+      rs.put("msg", "NLP密码长度不能超过32");
+      return rs;
+    }
+    return userPortraitService.updateNlp(username, nlpName, nlpPwd);
+  }
 }

xzl-admin/src/main/java/com/xzl/web/service/UserPortraitService.java

@@ -6,9 +6,11 @@ import java.util.List;
 import java.util.Map;
 
 public interface UserPortraitService {
-    List<String> getWordCloudInfo();
+  List<String> getWordCloudInfo();
 
-    String loginNLP(LoginBody loginBody);
+  String loginNLP(LoginBody loginBody);
 
-    Map initByDingtalk() throws Exception;
+  Map initByDingtalk() throws Exception;
+
+  Map updateNlp(String username, String nlpUserName, String nlpPassword);
 }

xzl-admin/src/main/java/com/xzl/web/service/impl/UserPortraitServiceImpl.java

@@ -8,6 +8,7 @@ import com.xzl.common.core.domain.entity.SysDictData;
 import com.xzl.common.core.domain.entity.SysUser;
 import com.xzl.common.core.domain.model.LoginBody;
 import com.xzl.common.utils.SecurityUtils;
+import com.xzl.common.utils.StringUtils;
 import com.xzl.system.service.ISysConfigService;
 import com.xzl.system.service.ISysDeptService;
 import com.xzl.system.service.ISysDictDataService;
@@ -55,26 +56,9 @@ public class UserPortraitServiceImpl implements UserPortraitService {
 
 
   public String loginNLP(LoginBody loginBody) {
-    String username = loginBody.getUsername();
-    String password = loginBody.getPassword();
-
-    // 取npl默认用户
-    SysDictData dictParam = new SysDictData();
-    dictParam.setDictType("nlp_default");
-    List<SysDictData> sysDictDataList = dictDataService.selectDictDataList(dictParam);
-    if (sysDictDataList != null && sysDictDataList.size() > 0) {
-      SysDictData sysDictData = sysDictDataList.get(0);
-      if ("1".equals(sysDictData.getDictValue())) {
-        username = "data1";
-        password = "617218bb2a6568ce";
-      }
-    }
-/*
-//    String username = "data1";
-//    String password = "Abc@1234";
-      // 密码加密
-      password = "617218bb2a6568ce";
- */
+    SysUser sysUser = userService.selectUserByUserName(loginBody.getUsername());
+    String username = sysUser.getNlpName();
+    String password = sysUser.getNlpPwd();
     // 调用登录
     Map loginForm = new HashMap();
     loginForm.put("username", username);
@@ -357,4 +341,23 @@ public class UserPortraitServiceImpl implements UserPortraitService {
     rs.put("userDelCount", delList.size());
     return rs;
   }
+
+  @Override
+  public Map updateNlp(String username, String nlpUserName, String nlpPassword) {
+    Map rs = new HashMap();
+    rs.put("success", 0);
+    SysUser sysUser = userService.selectUserByUserName(username);
+    if (sysUser == null) {
+      rs.put("msg", "用户不存在");
+      return rs;
+    }
+    SysUser user = new SysUser();
+    user.setUserId(sysUser.getUserId());
+    user.setNlpName(nlpUserName);
+    user.setNlpPwd(nlpPassword);
+    userService.updateUser(user);
+    rs.put("success", 1);
+    rs.put("msg", "密码修改成功");
+    return rs;
+  }
 }

xzl-common/src/main/java/com/xzl/common/core/domain/entity/SysUser.java

@@ -128,6 +128,9 @@ public class SysUser extends BaseEntity {
   private Long dingDeptId;
   private String dingUnionId;
 
+  private String nlpName;
+  private String nlpPwd;
+
   public SysUser() {
 
   }
@@ -312,6 +315,22 @@ public class SysUser extends BaseEntity {
     this.dingUnionId = dingUnionId;
   }
 
+  public String getNlpName() {
+    return nlpName;
+  }
+
+  public void setNlpName(String nlpName) {
+    this.nlpName = nlpName;
+  }
+
+  public String getNlpPwd() {
+    return nlpPwd;
+  }
+
+  public void setNlpPwd(String nlpPwd) {
+    this.nlpPwd = nlpPwd;
+  }
+
   @Override
   public String toString() {
     return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

xzl-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"       column="remark"       />
         <result property="dingDeptId"   column="ding_dept_id" />
         <result property="dingUnionId"  column="ding_union_id"/>
+        <result property="nlpName"  column="nlp_name"/>
+        <result property="nlpPwd"  column="nlp_pwd"/>
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
@@ -51,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, u.nlp_name, u.nlp_pwd
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    left join sys_user_role ur on u.user_id = ur.user_id
@@ -59,7 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader ,
+		u.nlp_name, u.nlp_pwd
+		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
@@ -160,6 +164,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">remark,</if>
  			<if test="dingDeptId != null and dingDeptId != ''">ding_dept_id,</if>
  			<if test="dingUnionId != null and dingUnionId != ''">ding_union_id,</if>
+ 			<if test="nlpName != null and nlpName != ''">nlp_name,</if>
+ 			<if test="nlpPwd != null and nlpPwd != ''">nlp_pwd,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -176,7 +182,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="dingDeptId != null and dingDeptId != ''">#{dingDeptId},</if>
 			<if test="dingUnionId != null and dingUnionId != ''">#{dingUnionId},</if>
- 			sysdate()
+		    <if test="nlpName != null and nlpName != ''">#{nlpName},</if>
+		    <if test="nlpPwd != null and nlpPwd != ''">#{nlpPwd},</if>
+		    sysdate()
  		)
 	</insert>
 	
@@ -198,7 +206,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null">remark = #{remark},</if>
 			<if test="dingDeptId != null and dingDeptId != ''">ding_dept_id = #{dingDeptId},</if>
 			<if test="dingUnionId != null and dingUnionId != ''">ding_union_id = #{dingUnionId},</if>
- 			update_time = sysdate()
+			<if test="nlpName != null and nlpName != ''">nlp_name = #{nlpName},</if>
+			<if test="nlpPwd != null and nlpPwd != ''">nlp_pwd = #{nlpPwd},</if>
+			update_time = sysdate()
  		</set>
  		where user_id = #{userId}
 	</update>

xzl-ui/src/views/system/user/index.vue

@@ -310,6 +310,19 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="NLP用户名">
+              <el-input v-model="form.nlpName" placeholder="请输入NLP用户名" maxlength="32" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="NLP密码">
+              <el-input v-model="form.nlpPwd" placeholder="请输入NLP密码" maxlength="32" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -531,7 +544,9 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
+        nlpName: undefined,
+        nlpPwd: undefined,
       };
       this.resetForm("form");
     },