First week content (not to be continued)

Back to the bedroom, the first thing is to find out what Mr. Yang said in class "diff" program. Baidu a bit, talked about the most is the Linux diff command, so change a keyword, diff tool, found Diffmerge,p4merge,kdiff,textdiff and so on. The above tools are all two documents submitted to the program, the program returned the results of comparison, and I imagined not the same.

Then it's GitHub's study. Liaoche's GitHub tutorial is recommended here, and I like the style of speaking. Here's my github address. Https://github.com/yanyige?tab=repositories, to be ashamed, my github has been used as a "warehouse". Today reviewed the GitHub version fallback, using git reset--hard head^ command, while reviewing the git diff command, Yang teacher said the diff refers to Git in the diff? Before I submit a commit locally, using the diff command makes it easy to get the difference between the workspace and the staging area code, which makes it easier to record how much code is added.

Addressed issue with Web site accessibility due to WAF protection. An error was found while rebooting Tomcat,org.apache.catalina.startup.Catalina stopServerSEVERE: Could not contact localhost:8005. Tomcat may not be running. 百度之，发现需要找到tomcat相关进程并杀死，执行相关代码，成功重启。网站也可以正常访问了。又发现数据库发生Can’t connect to local MySQL server through socket ‘/var/lib/mysql/mysql.sock’ (2)错误。以前解决过，使用rm -rf /var/lib/mysql删除文件后使用service mysqld restart命令重启mysql即可。

	Number of lines of code	Blog words	Knowledge points
First week
Second week

<br>

Finally think about two topics, word frequency statistics and arithmetic. Intend to achieve arithmetic, randomly generated formulas, according to the formula to obtain results.

First week content (not to be continued)