Merge pull request #689 from visuddhinanda/laravel

🔧 add SnowFlake config

.env.example

@@ -58,4 +58,7 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 RPC_SERVER="https://rpc.wikipali.org"
 ASSETS_SERVER="https://assets-hk.wikipali.org"
 HELP_SERVER="https://help-hk.wikipali.org"
-GRAMMAR_SERVER="https://grammar-hk.wikipali.org"
+GRAMMAR_SERVER="https://grammar-hk.wikipali.org"
+
+SNOWFLAKE_DATA_CENTER_ID = 1
+SNOWFLAKE_WORKER_ID = 1

app/Console/Commands/InstallPaliSeries.php

@@ -3,6 +3,9 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use App\Models\BookTitle;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class InstallPaliSeries extends Command
 {
@@ -11,7 +14,7 @@ class InstallPaliSeries extends Command
      *
      * @var string
      */
-    protected $signature = 'command:name';
+    protected $signature = 'install:paliseries';
 
     /**
      * The console command description.
@@ -37,6 +40,42 @@ class InstallPaliSeries extends Command
      */
     public function handle()
     {
+		$this->info("upgrade pali text");
+		$startTime = time();
+
+
+
+					DB::transaction(function () {
+						#删除目标数据库中数据
+						BookTitle::where('book','>',0)->delete();
+
+					// 打开csv文件并读取数据										
+						$strFileName = config("app.path.pali_title") . "/pali_serieses.csv";
+						if(!file_exists($strFileName)){
+							return 1;
+						}						
+						$inputRow = 0;
+						if (($fp = fopen($strFileName, "r")) !== false) {
+							while (($data = fgetcsv($fp, 0, ',')) !== false) {
+								if($inputRow>0){
+									$newData = [
+										'book'=>$data[1],
+										'paragraph'=>$data[2],
+										'title'=>$data[3],
+									];
+		
+									BookTitle::create($newData);									
+								}
+								$inputRow++;
+							}
+							fclose($fp);
+							Log::info("res load：" .$strFileName);
+						} else {
+							$this->error("can not open csv $strFileName");
+							Log::error("can not open csv $strFileName");
+						}
+					});
+		$this->info("ok");
         return 0;
     }
 }

app/Models/BookTitle.php

@@ -8,4 +8,6 @@ use Illuminate\Database\Eloquent\Model;
 class BookTitle extends Model
 {
     use HasFactory;
+	
+	protected $fillable = ['book' , 'paragraph' , 'title'];
 }

change-logs.md

@@ -32,4 +32,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - rename RPC_DOMAIN_NAME -> RPC_SERVER in config.sample.php
 - remove WWW_DOMAIN_NAME  from config.sample.js
 - rename RPC_DOMAIN_NAME -> RPC_SERVER in config.sample.js
-- add RPC_SERVER to .env.example
+- add RPC_SERVER to .env.example
+
+## [1.0.4] - 2022-01-21
+
+- add SNOWFLAKE to .env.example
+- add SnowFlake to config.sample.php

deploy/install1.bat

@@ -0,0 +1,27 @@
+php ../app/install/db_insert_templet_cli.::php 1 217
+php ../app/install/db_update_toc_cli.::php 1 217 pali
+php ../app/install/db_update_toc_cli.::php 1 217 zh-hans
+php ../app/install/db_update_toc_cli.::php 1 217 zh-hant
+::耗时30min
+::php ../app/install/db_insert_palitext_cli.::php 1 217
+::php ../app/install/db_update_palitext_cli.::php 1 217
+::php ../app/install/db_insert_bookword_from_csv_cli.::php 1 217
+::耗时9min
+::php ../app/install/db_insert_word_from_csv_cli.::php 1 217
+::耗时22min
+
+
+::php ../app/install/db_insert_wordindex_from_csv_cli.php
+::php ../app/admin/word_index_weight_refresh.::php 1 217
+::耗时51min
+::php ./migaration/20211202084900_init_pali_serieses.php
+::php ./migaration/20211125155600_word_statistics.php
+::php ./migaration/20211125155700_pali_sent_org.php
+::php ./migaration/20211125165700-pali_sent-upgrade.php
+::php ./migaration/20211126220400-pali_sent_index-upgrade.php
+::耗时15min
+::php ./migaration/20211127214800_sent_sim.php
+::php ./migaration/20211127214900-sent_sim_index.php
+::耗时53min
+php ../app/fts/sql.php
+net time \\127.0.0.1

deploy/install2.bat

@@ -0,0 +1,26 @@
+::php ../app/install/db_insert_templet_cli.::php 1 217
+::php ../app/install/db_update_toc_cli.::php 1 217 pali
+::php ../app/install/db_update_toc_cli.::php 1 217 zh-hans
+::php ../app/install/db_update_toc_cli.::php 1 217 zh-hant
+::耗时30min
+php ../app/install/db_insert_palitext_cli.::php 1 217
+php ../app/install/db_update_palitext_cli.::php 1 217
+php ../app/install/db_insert_bookword_from_csv_cli.::php 1 217
+::耗时9min
+::php ../app/install/db_insert_word_from_csv_cli.::php 1 217
+::耗时22min
+
+::php ../app/install/db_insert_wordindex_from_csv_cli.php
+::php ../app/admin/word_index_weight_refresh.::php 1 217
+::耗时51min
+::php ./migaration/20211202084900_init_pali_serieses.php
+::php ./migaration/20211125155600_word_statistics.php
+::php ./migaration/20211125155700_pali_sent_org.php
+::php ./migaration/20211125165700-pali_sent-upgrade.php
+::php ./migaration/20211126220400-pali_sent_index-upgrade.php
+::耗时15min
+::php ./migaration/20211127214800_sent_sim.php
+::php ./migaration/20211127214900-sent_sim_index.php
+::耗时53min
+php ../app/fts/sql.php
+net time \\127.0.0.1

deploy/install3.bat

@@ -0,0 +1,26 @@
+::php ../app/install/db_insert_templet_cli.::php 1 217
+::php ../app/install/db_update_toc_cli.::php 1 217 pali
+::php ../app/install/db_update_toc_cli.::php 1 217 zh-hans
+::php ../app/install/db_update_toc_cli.::php 1 217 zh-hant
+::耗时30min
+::php ../app/install/db_insert_palitext_cli.::php 1 217
+::php ../app/install/db_update_palitext_cli.::php 1 217
+::php ../app/install/db_insert_bookword_from_csv_cli.::php 1 217
+::耗时9min
+php ../app/install/db_insert_word_from_csv_cli.::php 1 217
+::耗时22min
+
+::php ../app/install/db_insert_wordindex_from_csv_cli.php
+::php ../app/admin/word_index_weight_refresh.::php 1 217
+::耗时51min
+::php ./migaration/20211202084900_init_pali_serieses.php
+::php ./migaration/20211125155600_word_statistics.php
+::php ./migaration/20211125155700_pali_sent_org.php
+::php ./migaration/20211125165700-pali_sent-upgrade.php
+::php ./migaration/20211126220400-pali_sent_index-upgrade.php
+::耗时15min
+::php ./migaration/20211127214800_sent_sim.php
+::php ./migaration/20211127214900-sent_sim_index.php
+::耗时53min
+php ../app/fts/sql.php
+net time \\127.0.0.1

deploy/install4.bat

@@ -0,0 +1,26 @@
+::php ../app/install/db_insert_templet_cli.::php 1 217
+::php ../app/install/db_update_toc_cli.::php 1 217 pali
+::php ../app/install/db_update_toc_cli.::php 1 217 zh-hans
+::php ../app/install/db_update_toc_cli.::php 1 217 zh-hant
+::耗时30min
+::php ../app/install/db_insert_palitext_cli.::php 1 217
+::php ../app/install/db_update_palitext_cli.::php 1 217
+::php ../app/install/db_insert_bookword_from_csv_cli.::php 1 217
+::耗时9min
+::php ../app/install/db_insert_word_from_csv_cli.::php 1 217
+::耗时22min
+
+php ../app/install/db_insert_wordindex_from_csv_cli.php
+php ../app/admin/word_index_weight_refresh.::php 1 217
+::耗时51min
+::php ./migaration/20211202084900_init_pali_serieses.php
+::php ./migaration/20211125155600_word_statistics.php
+::php ./migaration/20211125155700_pali_sent_org.php
+::php ./migaration/20211125165700-pali_sent-upgrade.php
+::php ./migaration/20211126220400-pali_sent_index-upgrade.php
+::耗时15min
+::php ./migaration/20211127214800_sent_sim.php
+::php ./migaration/20211127214900-sent_sim_index.php
+::耗时53min
+php ../app/fts/sql.php
+net time \\127.0.0.1

deploy/install5.bat

@@ -0,0 +1,26 @@
+::php ../app/install/db_insert_templet_cli.::php 1 217
+::php ../app/install/db_update_toc_cli.::php 1 217 pali
+::php ../app/install/db_update_toc_cli.::php 1 217 zh-hans
+::php ../app/install/db_update_toc_cli.::php 1 217 zh-hant
+::耗时30min
+::php ../app/install/db_insert_palitext_cli.::php 1 217
+::php ../app/install/db_update_palitext_cli.::php 1 217
+::php ../app/install/db_insert_bookword_from_csv_cli.::php 1 217
+::耗时9min
+::php ../app/install/db_insert_word_from_csv_cli.::php 1 217
+::耗时22min
+
+::php ../app/install/db_insert_wordindex_from_csv_cli.php
+::php ../app/admin/word_index_weight_refresh.::php 1 217
+::耗时51min
+php ./migaration/20211202084900_init_pali_serieses.php
+php ./migaration/20211125155600_word_statistics.php
+php ./migaration/20211125155700_pali_sent_org.php
+php ./migaration/20211125165700-pali_sent-upgrade.php
+php ./migaration/20211126220400-pali_sent_index-upgrade.php
+::耗时15min
+::php ./migaration/20211127214800_sent_sim.php
+::php ./migaration/20211127214900-sent_sim_index.php
+::耗时53min
+php ../app/fts/sql.php
+net time \\127.0.0.1

deploy/install6.bat

@@ -0,0 +1,26 @@
+::php ../app/install/db_insert_templet_cli.::php 1 217
+::php ../app/install/db_update_toc_cli.::php 1 217 pali
+::php ../app/install/db_update_toc_cli.::php 1 217 zh-hans
+::php ../app/install/db_update_toc_cli.::php 1 217 zh-hant
+::耗时30min
+::php ../app/install/db_insert_palitext_cli.::php 1 217
+::php ../app/install/db_update_palitext_cli.::php 1 217
+::php ../app/install/db_insert_bookword_from_csv_cli.::php 1 217
+::耗时9min
+::php ../app/install/db_insert_word_from_csv_cli.::php 1 217
+::耗时22min
+
+::php ../app/install/db_insert_wordindex_from_csv_cli.php
+::php ../app/admin/word_index_weight_refresh.::php 1 217
+::耗时51min
+::php ./migaration/20211202084900_init_pali_serieses.php
+::php ./migaration/20211125155600_word_statistics.php
+::php ./migaration/20211125155700_pali_sent_org.php
+::php ./migaration/20211125165700-pali_sent-upgrade.php
+::php ./migaration/20211126220400-pali_sent_index-upgrade.php
+::耗时15min
+php ./migaration/20211127214800_sent_sim.php
+php ./migaration/20211127214900-sent_sim_index.php
+::耗时53min
+php ../app/fts/sql.php
+net time \\127.0.0.1

public/app/pcdl/html_foot.php

@@ -1,7 +1,7 @@
 <!---->
 
 <div class="foot_div">
-	<div class="">
+	<div class="" style='display:none;'>
 		<div>
 			<div>联系我们</div>
 			<div>

public/app/studio/css/style.css

@@ -4155,6 +4155,7 @@ border-bottom: 2px solid red;
 
 .edit_detail_p {
 	display: flex;
+	padding:2px 0;
 }
 
 .edit_detail_span {

public/app/studio/editor.php

@@ -303,7 +303,29 @@ else{$currDevice="computer";}
 	#merge_button:hover>.icon{
 		fill: var(--link-hover-color);
 	}
-	</style>
+	#om_dropdown_area::-webkit-scrollbar {
+		width: 10px;
+		height: 10px;
+	}
+	#om_dropdown_area::-webkit-scrollbar-thumb {
+		background-color: var(--link-color);
+	}
+	#om_dropdown_area::-webkit-scrollbar-thumb:hover {
+		background-color:var(--tool-link-hover-color);
+	}
+	#om_dropdown_area::-webkit-scrollbar-button:single-button {
+		width: 10px
+		height: 10px;
+		display: block;
+		background-color: var(--link-color);
+		border-radius: 10px;
+	}
+
+	#om_dropdown_area::-webkit-scrollbar-button:single-button:hover {
+		background-color:var(--tool-link-hover-color);
+	}
+
+		</style>
 	<link type="text/css" rel="stylesheet" href="css/print.css" media="print" />
 	<style id="display_set">
 	</style>
@@ -754,8 +776,8 @@ foreach($plugin_list as $info){
 				<div class="edit_detail_p" >
 					<guide gid="studio_part_meaning">④</guide>
 					<span class="edit_detail_span"><?php echo $_local->gui->partmeaning;?>：</span>
-					<div id="input_org_select" class="input_bar" style="width:80%; display:inline-flex;"></div>
-					<input type="text" id="input_om" class="input_bar" value="" name="in_om" onblur="input_org_switch('input_om','input_org_select')">
+					<div id="input_org_select" class="input_bar" style="width:80%; display:inline-flex;justify-content: space-between;"></div>
+					<input type="text" id="input_om" class="input_bar" value="" name="in_om" onchange='input_om_change(this)' onblur="input_org_switch('input_om','input_org_select')">
 				</div>
 				<!-- 格位 -->
 				<div class="edit_detail_p">

public/app/studio/js/editor.js

@@ -3144,11 +3144,14 @@ function showModifyWin(sWordId) {
 	//showCurrWordTable(sReal);
 
 	if (g_useMode == "edit") {
+		//初始值
 		$("#input_meaning").val(sMeaning);
 		$("#input_org").val(sOrg);
 		$("#input_om").val(sOm);
 		$("#input_case").val(sCase);
-
+		$("#input_parent_grammar").val(sParentGrammar);
+		$("#id_text_prt_prt").val(sParent2);
+		
 		if (sParentGrammar != "" || sParent2 != "" || sParent2 != " ") {
 			document.getElementById("edit_detail_prt_prt").style.display = "block";
 			document.getElementById("svg_parent2").style.transform = "rotate(90deg)";
@@ -3157,7 +3160,7 @@ function showModifyWin(sWordId) {
 			document.getElementById("svg_parent2").style.transform = "rotate(0deg)";
 		}
 		document.getElementById("parent_grammar").innerHTML = getLocalGrammaStr(sParentGrammar);
-		$("#id_text_prt_prt").val(sParent2);
+
 
 		//右侧修改菜单
 		$("#word_mdf_mean_dropdown").html(render_word_menu_mean(g_currEditWord, 1));
@@ -3450,7 +3453,24 @@ function load_my_formula() {
 		}
 	);
 }
+/*
+  |------------------------------------
+  |当人工输入拆分意思后，更新拆分意思数组
+  |------------------------------------
+  |obj : 输入框
+  |------------------------------------
+*/
+function input_om_change(obj){
+	g_arrPartMean = obj.value().split('+');
+}
 
+/*
+  |------------------------------------
+  |当选择拆分意思菜单后，更新拆分意思输入框
+  |------------------------------------
+  | 
+  |------------------------------------
+*/
 function part_mean_ok() {
 	var part_mean_ok_str = g_arrPartMean.join("+");
 	part_mean_ok_str = "#" + part_mean_ok_str + "#";
@@ -3490,7 +3510,7 @@ function refreshPartMeaningSelect() {
 	if (g_initPartMeaning) {
 		g_arrPartMean = part.split("+");
 	}
-	var output = "<div style='overflow-x: scroll;white-space: nowrap;max-width: 13em;'>";
+	var output = "<div id='om_dropdown_area' style='overflow-x: auto;white-space: nowrap;max-width: 13em;'>";
 	//output="<span style='width:90%' onclick=\"input_org_switch('input_org_select','input_om')\"></span><br/>"
 	for (iPart in arrPart) {
 		output += getMeaningMenuList(iPart, arrPart[iPart]);
@@ -3500,7 +3520,8 @@ function refreshPartMeaningSelect() {
 			output += "+";
 		}
 	}
-	output += "</div><div>";
+	output += "</div>";
+	output += "<div style='width: 5.5em;'>";
 	output += "<button style='margin-left:auto; padding: 1px 6px;' onclick=\"copy_part_mean_to_mean()\">";
 	output += '<svg class="icon"><use xlink="http://www.w3.org/1999/xlink" href="svg/icon.svg#ic_vertical_align_top">';
 	output += "</button>";