系统认证相关代码提交(3)

Signed-off-by: TanYibin <5491541@qq.com>

系统认证相关代码提交(3)
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬 · 肖超群
1 parent c22e97fc
Showing 8 changed files with 42 additions and 76 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/router/index.js
ant-design-vue-jeecg/src/views/user/modules/SystemActivationModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/LoginController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/system/model/SystemAuthenticationModel.java → huaheng-wms-core/src/main/java/org/jeecg/modules/system/model/SystemActivationModel.java
huaheng-wms-core/src/main/resources/application-dev.yml
huaheng-wms-core/src/main/resources/application-prod.yml
huaheng-wms-core/src/main/resources/application-test.yml
@@ -18,6 +18,8 @@ const frozenBatch = (params) =&gt; putAction(&quot;/sys/user/frozenBatch&quot;, params);
 const checkOnlyUser = (params) => getAction("/sys/user/checkOnlyUser", params);
 //改变密码
 const changePassword = (params) => putAction("/sys/user/changePassword", params);
+//激活码校验
+const systemActivation = (params) => postAction("/sys/systemActivation", params);
  
 //权限管理
 const addPermission = (params) => postAction("/sys/permission/add", params);
@@ -229,6 +231,7 @@ export {
   frozenBatch,
   checkOnlyUser,
   changePassword,
+  systemActivation,
   getPermissionList,
   addPermission,
   editPermission,
@@ -274,6 +277,3 @@ export {
   getUserNoticeInfo,
   getDictItemsFromCache
 }
-
-
-
@@ -9,4 +9,11 @@ export default new Router({
   base: process.env.BASE_URL,
   scrollBehavior: () => ({y: 0}),
   routes: constantRouterMap
-})
 \ No newline at end of file
+})
+
+const originalPush = Router.prototype.push;
+Router.prototype.push = function push(location, onResolve, onReject) {
+  if (onResolve || onReject)
+    return originalPush.call(this, location, onResolve, onReject);
+  return originalPush.call(this, location).catch((err) => err);
+};
 \ No newline at end of file
 <template>
   <div class="main">
-    <a-form-model class="user-layout-login" @keyup.enter.native="handleSubmit" :rules="validatorRules">
+    <a-form-model class="user-layout-login" @keyup.enter.native="handleSubmit" :model="model" :rules="validatorRules">
       <a-tabs :activeKey="customActiveKey" :tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }" @change="handleTabClick">
         <a-tab-pane key="tab1" tab="激活码授权">
           <!-- <login-account ref="alogin" @validateFail="validateFail" @success="requestSuccess" @fail="requestFailed"></login-account> -->
@@ -30,6 +30,7 @@ import {ACCESS_TOKEN, ENCRYPTED_STRING} from &#39;@/store/mutation-types&#39;
 import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
 import {getEncryptedString} from '@/utils/encryption/aesEncrypt'
 import {timeFix} from '@/utils/util'
+import {systemActivation} from '@/api/api'
  
 export default {
   components: {
@@ -50,11 +51,10 @@ export default {
       model: {
         activationCode: ''
       },
-
       validatorRules: {
         activationCode: [{
           required: true, message: '请输入激活码', validator: 'click'
-        }]
+        }],
       }
     }
   },
@@ -100,45 +100,12 @@ export default {
         callback(err)
       })
     },
-    //登录
+    //验证激活码
     handleSubmit() {
       this.loginBtn = true;
       console.log('handleSubmit start')
       this.handleSystemActivation(this.rememberMe)
     },
-    // 校验失败
-    validateFail() {
-      this.loginBtn = false;
-    },
-    // 登录后台成功
-    requestSuccess(loginResult) {
-      this.$refs.loginSelect.show(loginResult)
-    },
-    //登录后台失败
-    requestFailed(err) {
-      let description = ((err.response || {}).data || {}).message || err.message || "请求出现错误，请稍后再试"
-      this.$notification['error']({
-        message: '登录失败',
-        description: description,
-        duration: 4,
-      });
-      //账户密码登录错误后更新验证码
-      if (this.customActiveKey === 'tab1' && description.indexOf('密码错误') > 0) {
-        this.$refs.alogin.handleChangeCheckCode()
-      }
-      this.loginBtn = false;
-    },
-    loginSelectOk() {
-      this.loginSuccess()
-    },
-    //登录成功
-    loginSuccess() {
-      this.$router.push({path: "/dashboard/analysis"});
-      this.$notification.success({
-        message: '欢迎',
-        description: `${timeFix()}，欢迎回来`,
-      });
-    },
     systemActivationSuccess() {
       this.$router.push({path: "/user/login"});
       this.$notification.success({
@@ -146,22 +113,13 @@ export default {
         // description: `${timeFix()}，欢迎回来`,
       });
     },
-    systemActivationSuccessError() {
+    systemActivationSuccessError(message) {
       this.$notification.error({
-        message: '激活失败，请重新输入',
+        message: message,
         // description: `${timeFix()}，欢迎回来`,
       });
       this.loginBtn = false;
     },
-    stepCaptchaSuccess() {
-      this.loginSuccess()
-    },
-    stepCaptchaCancel() {
-      this.Logout().then(() => {
-        this.loginBtn = false
-        this.stepCaptchaVisible = false
-      })
-    },
     //获取密码加密规则
     getEncrypte() {
       var encryptedString = Vue.ls.get(ENCRYPTED_STRING);
@@ -174,18 +132,18 @@ export default {
       }
     },
     handleSystemActivation(rememberMe) {
-      console.log('handleLogin start')
-      let loginParams = {
+      console.log('handleSystemActivation start')
+      let systemActivationModelParams = {
         activationCode: this.model.activationCode,
       }
-      // this.systemActivationSuccess();
-      this.systemActivationSuccessError();
-      // this.loginSelectOk();
-      // this.Login(loginParams).then((res) => {
-      //   this.$emit('success', res.result)
-      // }).catch((err) => {
-      //   this.$emit('fail', err)
-      // });
+      systemActivation(systemActivationModelParams).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.systemActivationSuccess();
+        } else {
+          this.systemActivationSuccessError(res.message);
+        }
+      });
     }
   }
 }
@@ -33,7 +33,7 @@ import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysTenant;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.model.SysLoginModel;
-import org.jeecg.modules.system.model.SystemAuthenticationModel;
+import org.jeecg.modules.system.model.SystemActivationModel;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysLogService;
@@ -162,6 +162,7 @@ public class LoginController {
             result.error500("请选择仓库编码");
             return result;
         }
+        // 激活信息认证
 //        result = HuahengJwtUtil.checkSystemActivationCode();
 //        if (!result.isSuccess()) {
 //            return result;
@@ -180,9 +181,9 @@ public class LoginController {
  
     @ApiOperation("系统激活API")
     @RequestMapping(value = "/systemActivation", method = RequestMethod.POST)
-    public Result<JSONObject> systemAuthentication(@RequestBody SystemAuthenticationModel systemAuthenticationModel) throws IOException {
+    public Result<JSONObject> systemAuthentication(@RequestBody SystemActivationModel systemActivationModel) throws IOException {
         Result<JSONObject> result = new Result<JSONObject>();
-        if (StringUtils.isEmpty(systemAuthenticationModel.getActivationCode())) {
+        if (StringUtils.isEmpty(systemActivationModel.getActivationCode())) {
             result.error500("请输入激活码");
             return result;
         }
@@ -191,14 +192,14 @@ public class LoginController {
             Algorithm algorithm = Algorithm.RSA256(new SystemRSA256Key().getPublicKey(), new SystemRSA256Key().getPrivateKey());
             JWTVerifier verifier =
                 JWT.require(algorithm).withClaim("operator", HuahengJwtUtil.HUAHENG_SYSTEM_ID).withIssuer(HuahengJwtUtil.HUAHENG_SYSTEM_ID).build();
-            DecodedJWT jwt = verifier.verify(systemAuthenticationModel.getActivationCode());
+            DecodedJWT jwt = verifier.verify(systemActivationModel.getActivationCode());
             new ApiAuthentication.ApiAuthenticationBuild().operator(jwt.getClaim("operator").asString()).audience(jwt.getAudience().get(0)).issuer(jwt.getIssuer())
                 .issuedAt(jwt.getIssuedAt()).expireDateTime(jwt.getExpiresAt()).bulid();
  
             // 验证通过写入文件
             File file = new File(System.getProperties().getProperty("user.dir") + File.separatorChar + HuahengJwtUtil.SYSTEM_ACTIVATION_CODE_FILE_NAME);
             outputStream = new FileOutputStream(file, false);
-            FileCopyUtils.copy(systemAuthenticationModel.getActivationCode().getBytes(), outputStream);
+            FileCopyUtils.copy(systemActivationModel.getActivationCode().getBytes(), outputStream);
         } catch (JWTVerificationException e) {
             log.error(e.getMessage());
             result.error500("激活失败");
@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "系统认证对象", description = "系统认证对象")
-public class SystemAuthenticationModel {
+public class SystemActivationModel {
  
     @ApiModelProperty(value = "ActivationCode")
     private String activationCode;
@@ -138,7 +138,7 @@ spring:
         master:
           url: jdbc:log4jdbc:mysql://localhost:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
           username: root
-          password: HHsoft123.
+          password: 123456
           driver-class-name: net.sf.log4jdbc.DriverSpy
           # sqlserver 数据源配置
           # url: jdbc:sqlserver://172.16.29.88:1433;DatabaseName=wms4;encrypt=false;SelectMethod=cursor;
@@ -159,9 +159,9 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 172.16.29.77
+    host: 127.0.0.1
     port: 6379
-    password: 123456
+    password:
     lettuce:
       pool:
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
@@ -208,7 +208,7 @@ jeecg:
     #webapp文件路径
     webapp: ./webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemAuthentication
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
@@ -281,8 +281,8 @@ jeecg:
       data-type: database
   #分布式锁配置
   redisson:
-    address: 172.16.29.77:6379
-    password: 123456
+    address: 127.0.0.1:6379
+    password:
     type: STANDALONE
     enabled: true
 #cas单点登录
@@ -208,7 +208,7 @@ jeecg:
     #webapp文件路径
     webapp: ./webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemAuthentication
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
@@ -209,7 +209,7 @@ jeecg:
     #webapp文件路径
     webapp: ./webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemAuthentication
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??