ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideUtils.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-admin/src/main/resources/application-tide.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-admin/src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideController.java
@@ -43,6 +43,8 @@ JSONObject tenant = JSONObject.parseObject(userInfo.get("tenant").toString()); AjaxResult ajax = AjaxResult.success(); // 生成令牌 log.info("租户信息:{}",userInfo); log.info("租户账号:{},租户密码:{}",tenant.get("tenantAccount").toString(), tenant.get("tenantPassword").toString()); String generateToken = loginService.login(tenant.get("tenantAccount").toString(), tenant.get("tenantPassword").toString(), null, IdWorker.get32UUID()); ajax.put(Constants.TOKEN, generateToken); @@ -52,11 +54,12 @@ @PostMapping("/applicationOrdering") public JSONObject order (@RequestBody TidePojo tidePojo) { SysUser user = userService.selectUserByUserName(tidePojo.getPltAccountLogin()); String randomString = TideUtils.getRandomString(12); String defaultPwd = "I73Kj+Mn$+SI";//默认开通密码固定写死 // String randomString = TideUtils.getRandomString(12); //账号不存在,执行新增操作 if(Objects.isNull(user)){ user = new SysUser(); String password = SecurityUtils.encryptPassword(randomString); String password = SecurityUtils.encryptPassword(defaultPwd); user.setPassword(password); user.setUserName(tidePojo.getPltAccountLogin()); user.setNickName(tidePojo.getEnterpriseName()); @@ -68,7 +71,7 @@ } Map<String, Object> map = new HashMap<>(); map.put("account", tidePojo.getPltAccountLogin()); map.put("token", randomString); map.put("token", defaultPwd); map.put("tenantId", user.getUserId()); return TideUtils.getResult(20000, "成功", map); } ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideUtils.java
@@ -21,9 +21,9 @@ @Component @Slf4j public class TideUtils { private final static String appId = "19472937-3039-4bf1-8334-13dc20e076e5"; private final static String appId = "cdde1d11-eab4-410f-88ad-d9881d08025f"; private final static String appSecret = "b57bbad60724f810e7bb7e1e7b8791b63eba50e50faef6fa819ade822fac9e4a"; private final static String appSecret = "190f5c1725dceaabe84024be1e3ff44fcdafecb6ae3c6ab28f9ec1b794cbb903"; // 内网地址 private final static String ip = "http://58.56.84.138:8083"; ruoyi-admin/src/main/resources/application-tide.yml
@@ -8,7 +8,7 @@ druid: # 主库数据源 master: url: jdbc:mysql://10.136.12.71:3306/mes-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://10.136.12.71:3306/wms-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: zttZTT123! # 从库数据源 ruoyi-admin/src/main/resources/application.yml
@@ -16,7 +16,7 @@ # 开发环境配置 server: # 服务器的HTTP端口 port: 8001 port: 8011 servlet: # 应用的访问路径 context-path: /