Merge branch 'fix/修复没有忘记密码界面密码没有加密传输的问题' into 'develop'

修复忘记密码界面没有加密传输的问题

See merge request o2oa/o2oa!2629

o2web/source/o2_core/o2/xAction/services/x_organization_assemble_personal.js

@@ -22,6 +22,34 @@ MWF.xAction.RestActions.Action["x_organization_assemble_personal"] = new Class({
             this.action.invoke({"name": "changePassword", "async": async, "data": data, "success": success, "failure": failure});
         }
     },
+    resetPassword: function( data, success, failure, async ){
+        if (layout.config.publicKey){
+            o2.load("../o2_lib/jsencrypt/jsencrypt.js", function(){
+                var encrypt = new JSEncrypt();
+                encrypt.setPublicKey("-----BEGIN PUBLIC KEY-----"+layout.config.publicKey+"-----END PUBLIC KEY-----");
+                var d = {
+                    "codeAnswer": data.codeAnswer,
+                    "credential": encrypt.encrypt(data.credential),
+                    "password": encrypt.encrypt(data.password)
+                };
+                this.action.invoke({"name": "resetPassword", "async": async, "data": d, "success": success, "failure": failure});
+            }.bind(this));
+        }else{
+            this.action.invoke({"name": "resetPassword", "async": async, "data": data, "success": success, "failure": failure});
+        }
+    },
+    createCodeOnResetPassword: function ( credential, success, failure, async ){
+        if (layout.config.publicKey){
+            o2.load("../o2_lib/jsencrypt/jsencrypt.js", function(){
+                var encrypt = new JSEncrypt();
+                encrypt.setPublicKey("-----BEGIN PUBLIC KEY-----"+layout.config.publicKey+"-----END PUBLIC KEY-----");
+                var c = encrypt.encrypt(credential);
+                this.action.invoke({"name": "createCodeOnResetPassword", "async": async, "parameter":{ "credential": encodeURIComponent(c) }, "success": success, "failure": failure});
+            }.bind(this));
+        }else{
+            this.action.invoke({"name": "createCodeOnResetPassword", "async": async, "parameter":{ "credential": credential }, "success": success, "failure": failure});
+        }
+    },
     getPersonIcon: function(id){
         var uri = "/jaxrs/person/icon";
         this.action.getAddress();