Browse Source

加备案号

15858193327 9 months ago
parent
commit
2d774e0870
72 changed files with 66 additions and 42 deletions
  1. 6 5
      .drone.yml
  2. 32 1
      README.md
  3. 28 36
      pom.xml
  4. 0 0
      src/main/asciidoc/ai/mockingbird/dataset.adoc
  5. 0 0
      src/main/asciidoc/blog/docker/docker容器分享.adoc
  6. 0 0
      src/main/asciidoc/blog/idea/plugins.adoc
  7. 0 0
      src/main/asciidoc/blog/idea/waka.png
  8. 0 0
      src/main/asciidoc/blog/index.adoc
  9. 0 0
      src/main/asciidoc/images/cloud/cloud-function.png
  10. 0 0
      src/main/asciidoc/images/cloud/cloud-platform.png
  11. 0 0
      src/main/asciidoc/images/cloud/k8s/k8s.png
  12. 0 0
      src/main/asciidoc/images/crypto/XOR.png
  13. 0 0
      src/main/asciidoc/images/crypto/aes/AES-group.jpg
  14. 0 0
      src/main/asciidoc/images/crypto/aes/AES.jpg
  15. 0 0
      src/main/asciidoc/images/crypto/aes/CBC-ECB.png
  16. 0 0
      src/main/asciidoc/images/crypto/aes/CBC-badGroup.png
  17. 0 0
      src/main/asciidoc/images/crypto/aes/CBC-badLength.png
  18. 0 0
      src/main/asciidoc/images/crypto/aes/CBC.jpg
  19. 0 0
      src/main/asciidoc/images/crypto/aes/CBC.png
  20. 0 0
      src/main/asciidoc/images/crypto/aes/CFB.jpg
  21. 0 0
      src/main/asciidoc/images/crypto/aes/CFB.png
  22. 0 0
      src/main/asciidoc/images/crypto/aes/CFB_CBC.png
  23. 0 0
      src/main/asciidoc/images/crypto/aes/CFB_repeatAttack.png
  24. 0 0
      src/main/asciidoc/images/crypto/aes/CTR_OFB.png
  25. 0 0
      src/main/asciidoc/images/crypto/aes/CTR_crypt.png
  26. 0 0
      src/main/asciidoc/images/crypto/aes/CTR_encrypt.png
  27. 0 0
      src/main/asciidoc/images/crypto/aes/ECB.png
  28. 0 0
      src/main/asciidoc/images/crypto/aes/ECB1.jpg
  29. 0 0
      src/main/asciidoc/images/crypto/aes/ECB2.jpg
  30. 0 0
      src/main/asciidoc/images/crypto/aes/OFB.jpg
  31. 0 0
      src/main/asciidoc/images/crypto/aes/OFB_CFB.png
  32. 0 0
      src/main/asciidoc/images/crypto/aes/OFB_crypt.png
  33. 0 0
      src/main/asciidoc/images/crypto/aes/OFB_decrypt.png
  34. 0 0
      src/main/asciidoc/images/crypto/aes/Pad1.jpg
  35. 0 0
      src/main/asciidoc/images/crypto/aes/Pad2PKCS5.jpg
  36. 0 0
      src/main/asciidoc/images/crypto/aes/StreamCrypto.jpg
  37. 0 0
      src/main/asciidoc/images/i8n/messageSource.png
  38. 0 0
      src/main/asciidoc/index.adoc
  39. 0 0
      src/main/asciidoc/infrastructure/newlinux.adoc
  40. 0 0
      src/main/asciidoc/ref/aes.adoc
  41. 0 0
      src/main/asciidoc/ref/language.adoc
  42. 0 0
      src/main/asciidoc/ref/port.adoc
  43. 0 0
      src/main/asciidoc/ref/technologies.adoc
  44. 0 0
      src/main/asciidoc/seo/seo.adoc
  45. 0 0
      src/main/asciidoc/specs/base/api.adoc
  46. 0 0
      src/main/asciidoc/specs/base/basic.adoc
  47. 0 0
      src/main/asciidoc/specs/base/communication.adoc
  48. 0 0
      src/main/asciidoc/specs/base/errorCode.adoc
  49. 0 0
      src/main/asciidoc/specs/base/extend.adoc
  50. 0 0
      src/main/asciidoc/specs/base/i18n.adoc
  51. 0 0
      src/main/asciidoc/specs/base/log.adoc
  52. 0 0
      src/main/asciidoc/specs/base/notify.adoc
  53. 0 0
      src/main/asciidoc/specs/demo.adoc
  54. 0 0
      src/main/asciidoc/specs/devOps/analyze.adoc
  55. 0 0
      src/main/asciidoc/specs/devOps/cicd.adoc
  56. 0 0
      src/main/asciidoc/specs/devOps/cloud-artifact.adoc
  57. 0 0
      src/main/asciidoc/specs/devOps/compatibility.adoc
  58. 0 0
      src/main/asciidoc/specs/devOps/deployAndUpgrade.adoc
  59. 0 0
      src/main/asciidoc/specs/devOps/monitor.adoc
  60. 0 0
      src/main/asciidoc/specs/manager/directory.adoc
  61. 0 0
      src/main/asciidoc/specs/manager/package.adoc
  62. 0 0
      src/main/asciidoc/specs/security/auth.adoc
  63. 0 0
      src/main/asciidoc/specs/security/crypto.adoc
  64. 0 0
      src/main/asciidoc/specs/security/negotiate.adoc
  65. 0 0
      src/main/asciidoc/specs/security/security.adoc
  66. 0 0
      src/main/asciidoc/specs/technology/db.adoc
  67. 0 0
      src/main/asciidoc/specs/technology/es.adoc
  68. 0 0
      src/main/asciidoc/specs/technology/go.adoc
  69. 0 0
      src/main/asciidoc/specs/technology/java.adoc
  70. 0 0
      src/main/asciidoc/specs/technology/javaScript.adoc
  71. 0 0
      src/main/asciidoc/specs/technology/python.adoc
  72. 0 0
      src/main/asciidoc/specs/technology/redis.adoc

+ 6 - 5
.drone.yml

@@ -10,15 +10,16 @@ steps:
   - name: htmlDir
     path: /htmlDir
   commands:
+  # 生成html
   - mvn clean generate-resources -B -V
-  - ls src
-  - ls src/main
-  - tree src
-  # 替换 css、js 为国内七牛云 cdn 地址
+  # 加备案号
+  - find target/shoulder-specs/ -type f -name "*.html" | xargs sed -i 's#<div id="footer-text">#<div id="footer-text"><a href="https://beian.miit.gov.cn/" target="_blank">鲁ICP备20024731号-1</a>#g'
+  # 国内访问加速: 替换 css、js 为国内七牛云 cdn 地址
   - find target/shoulder-specs/ -type f -name "*.html" | xargs sed -i 's#cdnjs.cloudflare.com/ajax/libs#cdn.staticfile.org#g'
-  # 替换 google 字体地址为 其他的
+  # 国内访问加速: 替换 google 字体地址为 其他的
   - find target/shoulder-specs/ -type f -name "*.html" | xargs sed -i 's#fonts.googleapis.com#fonts.cat.net#g'
   #- sed -i "s!cdnjs.cloudflare.com/ajax/libs!cdn.staticfile.org!g" `grep cdnjs.cloudflare -rl target/shoulder-specs/`
+  # 搬运到web目录(目前不会删除历史文档,只有更新)
   - cp -r target/shoulder-specs/* /htmlDir
   
 - name: 钉钉通知

+ 32 - 1
README.md

@@ -1,3 +1,34 @@
 # shoulder-dev-specs
 
-shoulder 的开发规范。
+shoulder 的开发规范。
+
+```bash
+L:\baseEnvironment\Toolbox\apps\IDEA-U\ch-0\232.8660.185\plugins\maven\lib\maven3\bin\mvn generate-resources
+```
+
+# 踩坑记录
+
+## 坑:【2021 java16就开始有了,现在还没解决】
+翻asciidoctor github issue 发现;去除 jruby 主动依赖解决(本身是可选的)
+
+WARN FilenoUtil : Native subprocess control requires open access to the JDK IO subsystem
+Pass '--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED' to enable.
+
+JRuby 的代码导致:
+asciidoctor-issue https://github.com/asciidoctor/asciidoctor-maven-plugin/issues/553
+https://github.com/asciidoctor/asciidoctorj/issues/1035
+
+jruby-issue
+https://github.com/jruby/jruby/issues/6721
+
+提到是JDK的安全更新但未提供替代方法原因
+
+## 坑2: asciidoctor adoc 源文件默认路径调整过
+翻asciidoctor github README解决
+
+最早:默认指向 ${basedir}/src/main/asciidoc
+
+后来:默认指向 ${basedir}/src/site/asciidoc
+
+## 坑3: java.lang.NoSuchFieldError: STRIO_READABLE
+去除 jruby 主动依赖解决(本身是可选的)

+ 28 - 36
pom.xml

@@ -21,6 +21,7 @@
         <asciidoctorj.version>2023.26</asciidoctorj.version>
         <asciidoctorj-diagram.version>2.2.10</asciidoctorj-diagram.version>
         <asciidoctorj-pdf.version>2.3.9</asciidoctorj-pdf.version>
+        <spring-asciidoctor-backends.version>0.0.6</spring-asciidoctor-backends.version>
         <jruby.version>9.4.3.0</jruby.version>
 
     </properties>
@@ -49,10 +50,15 @@
                 <configuration>
                     <!--<outputDirectory>${project.build.directory}/shoulder-specs/${project.version}</outputDirectory>-->
                     <outputDirectory>${project.build.directory}/shoulder-specs</outputDirectory>
+
+                    <!-- 默认是所有文件-->
                     <!--<sourceDocumentName>book.adoc</sourceDocumentName>
                     <imagesDir>./</imagesDir>-->
+
+                    <!--                    不在将所有文件都生成到同一个目录中,而是将输出文件生成到相同的目录结构中。-->
                     <preserveDirectories>true</preserveDirectories>
-                    <sourceDirectory>src/docs/asciidoc/generated</sourceDirectory>
+                    <!--                    -->
+                    <sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
                     <attributes>
                         <endpoint-url>http://example.org</endpoint-url>
                         <sourcedir>${project.build.sourceDirectory}</sourcedir>
@@ -72,9 +78,12 @@
                         </goals>
                         <configuration>
                             <backend>html5</backend>
+                            <embedAssets>true</embedAssets>
+
                             <!-- coderay prettify -->
-                            <sourceHighlighter>coderay</sourceHighlighter>
                             <attributes>
+                                <!--                                <backend>spring-html</backend>-->
+                                <sourceHighlighter>coderay</sourceHighlighter>
                                 <imagesdir>/images</imagesdir>
                                 <toc>left</toc>
                                 <icons>font</icons>
@@ -114,57 +123,40 @@
                     </execution>-->
                 </executions>
                 <dependencies>
-                    <!-- Comment this section to use the default jruby artifact provided by the plugin -->
-                    <dependency>
-                        <groupId>org.jruby</groupId>
-                        <artifactId>jruby-complete</artifactId>
-                        <version>${jruby.version}</version>
-                    </dependency>
+
+                    <!-- OPTIONAL Comment this section to use the default jruby artifact provided by the plugin -->
+<!--                    <dependency>-->
+<!--                        <groupId>org.jruby</groupId>-->
+<!--                        <artifactId>jruby-complete</artifactId>-->
+<!--                        <version>${jruby.version}</version>-->
+<!--                    </dependency>-->
                     <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
                     <!--<dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj</artifactId>
                         <version>${asciidoctorj.version}</version>
                     </dependency>-->
+
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj-diagram</artifactId>
                         <version>${asciidoctorj-diagram.version}</version>
                     </dependency>
-                    <dependency>
+
+                    <!--<dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj-pdf</artifactId>
                         <version>${asciidoctorj-pdf.version}</version>
-                    </dependency>
+                    </dependency>-->
+                    <!--                    <dependency>-->
+                    <!--                        <groupId>io.spring.asciidoctor.backends</groupId>-->
+                    <!--                        <artifactId>spring-asciidoctor-backends</artifactId>-->
+                    <!--                        <version>${spring-asciidoctor-backends.version}</version>-->
+                    <!--                    </dependency>-->
+
                 </dependencies>
             </plugin>
 
-
-            <!--打包插件-->
-            <!--<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>assemble</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>assembly.xml</descriptor>
-                            </descriptors>
-                            &lt;!&ndash;<recompressZippedFiles>true</recompressZippedFiles>&ndash;&gt;
-                            <finalName>shoulder-specs-${project.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <outputDirectory>target/</outputDirectory>
-                            <workDirectory>target/assembly/work</workDirectory>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>-->
         </plugins>
     </build>
 

+ 0 - 0
src/docs/asciidoc/ai/mockingbird/dataset.adoc → src/main/asciidoc/ai/mockingbird/dataset.adoc


+ 0 - 0
src/docs/asciidoc/blog/docker/docker容器分享.adoc → src/main/asciidoc/blog/docker/docker容器分享.adoc


+ 0 - 0
src/docs/asciidoc/blog/idea/plugins.adoc → src/main/asciidoc/blog/idea/plugins.adoc


+ 0 - 0
src/docs/asciidoc/blog/idea/waka.png → src/main/asciidoc/blog/idea/waka.png


+ 0 - 0
src/docs/asciidoc/blog/index.adoc → src/main/asciidoc/blog/index.adoc


+ 0 - 0
src/docs/asciidoc/images/cloud/cloud-function.png → src/main/asciidoc/images/cloud/cloud-function.png


+ 0 - 0
src/docs/asciidoc/images/cloud/cloud-platform.png → src/main/asciidoc/images/cloud/cloud-platform.png


+ 0 - 0
src/docs/asciidoc/images/cloud/k8s/k8s.png → src/main/asciidoc/images/cloud/k8s/k8s.png


+ 0 - 0
src/docs/asciidoc/images/crypto/XOR.png → src/main/asciidoc/images/crypto/XOR.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/AES-group.jpg → src/main/asciidoc/images/crypto/aes/AES-group.jpg


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/AES.jpg → src/main/asciidoc/images/crypto/aes/AES.jpg


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/CBC-ECB.png → src/main/asciidoc/images/crypto/aes/CBC-ECB.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/CBC-badGroup.png → src/main/asciidoc/images/crypto/aes/CBC-badGroup.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/CBC-badLength.png → src/main/asciidoc/images/crypto/aes/CBC-badLength.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/CBC.jpg → src/main/asciidoc/images/crypto/aes/CBC.jpg


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/CBC.png → src/main/asciidoc/images/crypto/aes/CBC.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/CFB.jpg → src/main/asciidoc/images/crypto/aes/CFB.jpg


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/CFB.png → src/main/asciidoc/images/crypto/aes/CFB.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/CFB_CBC.png → src/main/asciidoc/images/crypto/aes/CFB_CBC.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/CFB_repeatAttack.png → src/main/asciidoc/images/crypto/aes/CFB_repeatAttack.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/CTR_OFB.png → src/main/asciidoc/images/crypto/aes/CTR_OFB.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/CTR_crypt.png → src/main/asciidoc/images/crypto/aes/CTR_crypt.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/CTR_encrypt.png → src/main/asciidoc/images/crypto/aes/CTR_encrypt.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/ECB.png → src/main/asciidoc/images/crypto/aes/ECB.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/ECB1.jpg → src/main/asciidoc/images/crypto/aes/ECB1.jpg


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/ECB2.jpg → src/main/asciidoc/images/crypto/aes/ECB2.jpg


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/OFB.jpg → src/main/asciidoc/images/crypto/aes/OFB.jpg


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/OFB_CFB.png → src/main/asciidoc/images/crypto/aes/OFB_CFB.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/OFB_crypt.png → src/main/asciidoc/images/crypto/aes/OFB_crypt.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/OFB_decrypt.png → src/main/asciidoc/images/crypto/aes/OFB_decrypt.png


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/Pad1.jpg → src/main/asciidoc/images/crypto/aes/Pad1.jpg


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/Pad2PKCS5.jpg → src/main/asciidoc/images/crypto/aes/Pad2PKCS5.jpg


+ 0 - 0
src/docs/asciidoc/images/crypto/aes/StreamCrypto.jpg → src/main/asciidoc/images/crypto/aes/StreamCrypto.jpg


+ 0 - 0
src/docs/asciidoc/images/i8n/messageSource.png → src/main/asciidoc/images/i8n/messageSource.png


+ 0 - 0
src/docs/asciidoc/index.adoc → src/main/asciidoc/index.adoc


+ 0 - 0
src/docs/asciidoc/infrastructure/newlinux.adoc → src/main/asciidoc/infrastructure/newlinux.adoc


+ 0 - 0
src/docs/asciidoc/ref/aes.adoc → src/main/asciidoc/ref/aes.adoc


+ 0 - 0
src/docs/asciidoc/ref/language.adoc → src/main/asciidoc/ref/language.adoc


+ 0 - 0
src/docs/asciidoc/ref/port.adoc → src/main/asciidoc/ref/port.adoc


+ 0 - 0
src/docs/asciidoc/ref/technologies.adoc → src/main/asciidoc/ref/technologies.adoc


+ 0 - 0
src/docs/asciidoc/seo/seo.adoc → src/main/asciidoc/seo/seo.adoc


+ 0 - 0
src/docs/asciidoc/specs/base/api.adoc → src/main/asciidoc/specs/base/api.adoc


+ 0 - 0
src/docs/asciidoc/specs/base/basic.adoc → src/main/asciidoc/specs/base/basic.adoc


+ 0 - 0
src/docs/asciidoc/specs/base/communication.adoc → src/main/asciidoc/specs/base/communication.adoc


+ 0 - 0
src/docs/asciidoc/specs/base/errorCode.adoc → src/main/asciidoc/specs/base/errorCode.adoc


+ 0 - 0
src/docs/asciidoc/specs/base/extend.adoc → src/main/asciidoc/specs/base/extend.adoc


+ 0 - 0
src/docs/asciidoc/specs/base/i18n.adoc → src/main/asciidoc/specs/base/i18n.adoc


+ 0 - 0
src/docs/asciidoc/specs/base/log.adoc → src/main/asciidoc/specs/base/log.adoc


+ 0 - 0
src/docs/asciidoc/specs/base/notify.adoc → src/main/asciidoc/specs/base/notify.adoc


+ 0 - 0
src/docs/asciidoc/specs/demo.adoc → src/main/asciidoc/specs/demo.adoc


+ 0 - 0
src/docs/asciidoc/specs/devOps/analyze.adoc → src/main/asciidoc/specs/devOps/analyze.adoc


+ 0 - 0
src/docs/asciidoc/specs/devOps/cicd.adoc → src/main/asciidoc/specs/devOps/cicd.adoc


+ 0 - 0
src/docs/asciidoc/specs/devOps/cloud-artifact.adoc → src/main/asciidoc/specs/devOps/cloud-artifact.adoc


+ 0 - 0
src/docs/asciidoc/specs/devOps/compatibility.adoc → src/main/asciidoc/specs/devOps/compatibility.adoc


+ 0 - 0
src/docs/asciidoc/specs/devOps/deployAndUpgrade.adoc → src/main/asciidoc/specs/devOps/deployAndUpgrade.adoc


+ 0 - 0
src/docs/asciidoc/specs/devOps/monitor.adoc → src/main/asciidoc/specs/devOps/monitor.adoc


+ 0 - 0
src/docs/asciidoc/specs/manager/directory.adoc → src/main/asciidoc/specs/manager/directory.adoc


+ 0 - 0
src/docs/asciidoc/specs/manager/package.adoc → src/main/asciidoc/specs/manager/package.adoc


+ 0 - 0
src/docs/asciidoc/specs/security/auth.adoc → src/main/asciidoc/specs/security/auth.adoc


+ 0 - 0
src/docs/asciidoc/specs/security/crypto.adoc → src/main/asciidoc/specs/security/crypto.adoc


+ 0 - 0
src/docs/asciidoc/specs/security/negotiate.adoc → src/main/asciidoc/specs/security/negotiate.adoc


+ 0 - 0
src/docs/asciidoc/specs/security/security.adoc → src/main/asciidoc/specs/security/security.adoc


+ 0 - 0
src/docs/asciidoc/specs/technology/db.adoc → src/main/asciidoc/specs/technology/db.adoc


+ 0 - 0
src/docs/asciidoc/specs/technology/es.adoc → src/main/asciidoc/specs/technology/es.adoc


+ 0 - 0
src/docs/asciidoc/specs/technology/go.adoc → src/main/asciidoc/specs/technology/go.adoc


+ 0 - 0
src/docs/asciidoc/specs/technology/java.adoc → src/main/asciidoc/specs/technology/java.adoc


+ 0 - 0
src/docs/asciidoc/specs/technology/javaScript.adoc → src/main/asciidoc/specs/technology/javaScript.adoc


+ 0 - 0
src/docs/asciidoc/specs/technology/python.adoc → src/main/asciidoc/specs/technology/python.adoc


+ 0 - 0
src/docs/asciidoc/specs/technology/redis.adoc → src/main/asciidoc/specs/technology/redis.adoc