-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
・組織をCSVからインポートするAPIを追加。 ・グループをCSVからインポートするAPIを追加。 ・ユーザをCSVからインポートするAPIを追加。 ・ユーザのごみ箱機能を追加。 ・タブレットPC環境のユーザビリティの向上。 ・フィルターの状態を保持を設定しているビューに切り替えた際に否定の条件が保持されない問題を解消。 ・編集画面の自動ポストバック時にサーバスクリプトの画面表示ので実行したログが出力できない問題を解消。 ・ユーザーのインポートで2段階認証の有効化、無効化の設定が反映されない問題を解消。 ・サイトのアクセス制御タブに削除された組織が表示される問題を解消。 ・一覧のカスタムデザインを使用している場合に履歴の表示でエラーが発生する問題を解消。 ・結合したタイトルが変更履歴に正しく表示されない問題を解消。
- Loading branch information
Showing
80 changed files
with
2,972 additions
and
683 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| { | ||
| { | ||
| "profiles": { | ||
| "Implem.CodeDefiner": { | ||
| "commandName": "Project", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| using System; | ||
| using System.IO; | ||
| using System.Security.Cryptography; | ||
| using System.Text; | ||
|
|
||
| namespace Implem.Libraries.Utilities | ||
| { | ||
| public class CryptographyAes | ||
| { | ||
| public static string AesEncrypt(string encryptString, string encryptKey, string aesIv) | ||
| { | ||
| if (encryptString.Trim().IsNullOrEmpty()) return null; | ||
| if (encryptKey.Trim().IsNullOrEmpty()) return null; | ||
| using (var aes = Aes.Create()) | ||
| { | ||
| using var encryptor = aes.CreateEncryptor( | ||
| Encoding.UTF8.GetBytes(encryptKey.Substring(0, 32)), | ||
| Encoding.UTF8.GetBytes(aesIv)); | ||
| using var ms = new MemoryStream(); | ||
| using (var cs = new CryptoStream(ms, encryptor, CryptoStreamMode.Write)) | ||
| { | ||
| using var sw = new StreamWriter(cs); | ||
| sw.Write(encryptString); | ||
| } | ||
| return Convert.ToBase64String(ms.ToArray()); | ||
| } | ||
| } | ||
|
|
||
| public static string AesDecrypt(string decryptString, string decryptKey, string aesIv) | ||
| { | ||
| if (decryptString.Trim().IsNullOrEmpty()) return null; | ||
| if (decryptKey.Trim().IsNullOrEmpty()) return null; | ||
| using (var aes = Aes.Create()) | ||
| { | ||
| using var decryptor = aes.CreateDecryptor( | ||
| Encoding.UTF8.GetBytes(decryptKey.Substring(0, 32)), | ||
| Encoding.UTF8.GetBytes(aesIv)); | ||
| using var ms = new MemoryStream(Convert.FromBase64String(decryptString)); | ||
| using var cs = new CryptoStream(ms, decryptor, CryptoStreamMode.Read); | ||
| using var sr = new StreamReader(cs); | ||
| return sr.ReadToEnd(); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.