Merge branch 'main' of github.com:Dapp-Learning-DAO/Official-website-…

…backend

.github/workflows/main.yml

@@ -0,0 +1,39 @@
+name: Official Backend CICD
+
+on:
+  push:
+    # 分支
+    branches: [ main ]
+  pull_request_target:
+    branches: [ main ]
+    types: [closed]
+  workflow_dispatch:
+
+jobs:
+  build:
+    if: |
+      github.event.pull_request.merged == true ||
+      github.event_name == 'push' ||
+      github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    name: Building background
+    steps:
+      - run: |
+          echo Build is triggered
+      - name: deploy_app #开始部署
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }} #服务器ip地址
+          username: ${{ secrets.USERNAME }} #服务器ssh用户名
+          password: ${{ secrets.PASSWORD }} #服务器ssh密码
+          port: ${{ secrets.PORT }} # 服务器ssh端口（默认22）
+          script: |
+            cd /root/Official-website-backend
+            rm -rf dist
+            git pull
+            bash ./gradlew build -x test
+            cd dist
+            export DBPWD=${{secrets.SPRING_DATASOURCE_PASSWORD}}
+            bash stop.sh
+            bash start.sh
+

.github/workflows/main.yml.bak

@@ -0,0 +1,56 @@
+name: Official Backend CICD
+
+on:
+  push:
+    # 分支
+    branches: [ main ]
+  pull_request_target:
+    branches: [ main ]
+    types: [closed]
+  workflow_dispatch:
+
+jobs:
+  build:
+    if: |
+      github.event.pull_request.merged == true ||
+      github.event_name == 'push' ||
+      github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    name: Building background
+    steps:
+      - run: |
+          echo Build is triggered
+      - uses: actions/checkout@v2 #拉取项目文件
+      - name: Set up JDK 8 #配置java环境
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+          cache: 'gradle'
+      - name: Grant execute permission for gradlew  #更改脚本权限
+        run: chmod +x gradlew
+      - name: Build with Gradle  #开始打包 -x test 跳过测试
+        run: ./gradlew jar -x test
+      - name: Copy folder content recursively to remote
+        uses: garygrossgarten/github-action-scp@release
+        with:
+          local: dist
+          remote: "/root/Dapp-Learning-Official-web/dist"
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          password: ${{ secrets.PASSWORD }}
+          port: ${{ secrets.PORT }} # 服务器ssh端口（默认22）
+      - name: deploy_app #开始部署
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }} #服务器ip地址
+          username: ${{ secrets.USERNAME }} #服务器ssh用户名
+          password: ${{ secrets.PASSWORD }} #服务器ssh密码
+          port: ${{ secrets.PORT }} # 服务器ssh端口（默认22）
+          script: |
+            cd /root/Dapp-Learning-Official-web/dist
+            export DBPWD=${{secrets.SPRING_DATASOURCE_PASSWORD}}
+            echo setting DBPWD to $DBPWD
+            sed  "s/\${SPRING_DATASOURCE_PASSWORD}/$DBPWD/g" conf/application.yml > conf/application.yml
+            bash stop.sh
+            bash start.sh

build.gradle

@@ -3,7 +3,7 @@ plugins {
 	id 'idea'
 	id 'org.springframework.boot' version '2.7.16'
 	id 'io.spring.dependency-management' version '1.0.15.RELEASE'
-	id "org.web3j" version "4.9.8"
+//	id "org.web3j" version "4.9.8"
 }
 
 group = 'com.dl'
@@ -22,6 +22,8 @@ configurations {
 repositories {
 	mavenCentral()
 	maven { url 'https://maven.aliyun.com/repository/public' }
+
+
 	maven { url 'https://jitpack.io' }
 }
 
@@ -80,17 +82,17 @@ jar {
 			into 'dist/lib'
 		}
 		copy {
-			from file('src/main/resources/application.yml')
+			from file('src/main/resources/application-template.yml')
 			into 'dist/conf/'
 		}
-//		copy {
-//			from file('src/main/resources/start.sh')
-//			into 'dist/'
-//		}
-//		copy {
-//			from file('src/main/resources/stop.sh')
-//			into 'dist/'
-//		}
+		copy {
+			from file('start.sh')
+			into 'dist/'
+		}
+		copy {
+			from file('stop.sh')
+			into 'dist/'
+		}
 		copy {
 			from file('.').listFiles().findAll { File f -> (f.name.endsWith('.sh') || f.name.endsWith('.env')) }
 			into 'dist'
@@ -104,28 +106,28 @@ clean {
 	delete 'build'
 	delete 'log'
 }
-
-web3j {
-	generatedPackageName = 'com.dl.officialsite.contract.{0}'
-	generatedFilesBaseDir = "src"
-	includedContracts = ['HappyRedPacket', 'ILendingPool', 'ILendingPoolAddressesProvider','IPoolAddressesProvider', "IPool"]
-	useNativeJavaTypes = true
-}
+//
+//web3j {
+//	generatedPackageName = 'com.dl.officialsite.contract.{0}'
+//	generatedFilesBaseDir = "src"
+//	includedContracts = ['HappyRedPacket', 'ILendingPool', 'ILendingPoolAddressesProvider','IPoolAddressesProvider', "IPool"]
+//	useNativeJavaTypes = true
+//}
 
 ext  {
 	web3jVersion = '4.9.3'
 }
 
 sourceSets {
 	main {
-		solidity {
-			srcDir {
-				"$project/src/main/solidity"
-			}
-		}
+//		solidity {
+//			srcDir {
+//				"$project/src/main/solidity"
+//			}
+//		}
 	}
 }
 
-node {
-	nodeProjectDir = file("./node")
-}
+//node {
+//	nodeProjectDir = file("./node")
+//}

src/main/resources/application-template.yml

@@ -0,0 +1,60 @@
+server:
+  port: 8080
+  servlet:
+    session:
+      timeout: 6m
+      cookie:
+        max-age: -1
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/dl?allowPublicKeyRetrieval=true&useSSL=false
+    #type: com.alibaba.druid.pool.DruidDataSource
+    username: root
+    #    password: 12345678
+    password: {{SPRING_DATASOURCE_PASSWORD}}
+  jpa:
+    hibernate:
+      ddl-auto: update
+    generate-ddl: true
+    show-sql: true
+    database-platform: org.hibernate.dialect.MySQL5Dialect
+  mail:
+    host: smtp.gmail.com
+    port: 587
+    username: [email protected]
+    password: ${GMAIL_PASSWORD}
+    properties:
+      mail:
+        smtp:
+          auth: true
+          ssl:
+            enable: true
+          starttls:
+            enable: true
+  session:
+    store-type: jdbc
+    jdbc:
+      initialize-schema: always
+      cleanup-cron: 0 */3 * * * *
+    timeout: 7200
+
+logging:
+  level:
+    org.springframework.security: debug
+
+ipfs:
+  url: /ip4/127.0.0.1/tcp/5001
+
+web3j:
+  client-address: "https://polygon-rpc.com"
+
+oauth:
+  registrations:
+    github:
+      clientId: "Iv1.74aecf988af67044"
+      clientSecret: "d0f38f58e98bb3dbb9a6bf6a2e1211a4feb24767"
+      accessTokenUri: https://github.com/login/oauth/access_token
+      userAuthorizationUri: https://github.com/login/oauth/authorize
+      userInfoUri: https://api.github.com/user
+
+

src/main/resources/application.yml

@@ -11,7 +11,7 @@ spring:
 #type: com.alibaba.druid.pool.DruidDataSource
     username: root
 #    password: 12345678
-    password: ${SPRING_DATASOURCE_PASSWORD}
+    password: {{SPRING_DATASOURCE_PASSWORD}}
   jpa:
     hibernate:
      ddl-auto: update

start.sh

@@ -5,16 +5,16 @@ CLASSPATH='conf/:apps/*:lib/*'
 CURRENT_DIR=$(pwd)/
 LOG_DIR=${CURRENT_DIR}log
 CONF_DIR=${CURRENT_DIR}conf
-
+cat conf/application.yml | sed "s/{{SPRING_DATASOURCE_PASSWORD}}/$DBPWD/g" conf/application-template.yml > conf/application.yml
 SERVER_PORT=$(cat $CONF_DIR/application.yml | grep "server:" -A 3 | grep "port" | awk '{print $2}'| sed 's/\r//')
 if [ ${SERVER_PORT}"" = "" ];then
     echo "$CONF_DIR/application.yml server port has not been configured"
     exit -1
 fi
-
+JAVA_CMD="${JAVA_HOME}/bin/java"
 if [ ${JAVA_HOME}"" = "" ];then
-    echo "JAVA_HOME has not been configured"
-    exit -1
+    echo "JAVA_HOME has not been configured, using java"
+    JAVA_CMD='java'
 fi
 
 mkdir -p log
@@ -45,7 +45,9 @@ start(){
         echo "==============================================================================================="
     else
         echo -n "Server $APP_MAIN Port $SERVER_PORT ..."
-        nohup $JAVA_HOME/bin/java -agentlib:jdwp=transport=dt_socket,address=9093,server=y,suspend=n -Djdk.tls.namedGroups="secp256k1" $JAVA_OPTS -Djava.library.path=$CONF_DIR -cp $CLASSPATH $APP_MAIN >> $LOG_DIR/front.out 2>&1 &
+        echo "$JAVA_CMD -agentlib:jdwp=transport=dt_socket,address=9093,server=y,suspend=n -Djdk.tls.namedGroups="secp256k1" $JAVA_OPTS -Djava.library.path=$CONF_DIR -cp $CLASSPATH $APP_MAIN >> $LOG_DIR/front.out 2>&1 &"
+
+        nohup $JAVA_CMD -agentlib:jdwp=transport=dt_socket,address=9093,server=y,suspend=n -Djdk.tls.namedGroups="secp256k1" $JAVA_OPTS -Djava.library.path=$CONF_DIR -cp $CLASSPATH $APP_MAIN >> $LOG_DIR/front.out 2>&1 &
 
         count=1
         result=0

stop.sh

@@ -5,7 +5,7 @@ CURRENT_DIR=$(pwd)/
 CONF_DIR=${CURRENT_DIR}conf
 
 SERVER_PORT=$(cat $CONF_DIR/application.yml | grep "server:" -A 3 | grep "port" | awk '{print $2}'| sed 's/\r//')
-if [ ${SERVER_PORT}"" = "" ];then
+if [ "${SERVER_PORT}" = "" ];then
     echo "$CONF_DIR/application.yml server port has not been configured"
     exit -1
 fi
@@ -23,7 +23,7 @@ checkProcess(){
 stop(){
 	checkProcess
 	echo "==============================================================================================="
-	if [ $processPid -ne 0 ]; then
+	if [ "$processPid" -ne 0 ]; then
 	    echo -n "Stopping Server $APP_MAIN Port $SERVER_PORT PID($processPid)..."
 	    kill -9 $processPid
 	    if [ $? -eq 0 ]; then