From 651940d463ae0389c2d16c2285de446779a27e52 Mon Sep 17 00:00:00 2001
From: Granty1 <granty1@163.com>
Date: Tue, 26 May 2020 10:05:04 +0800
Subject: [PATCH] Remove deploy script & reset config file

---
 .github/workflows/backend_deploy.yml | 100 +++++++++++++--------------
 server/config.yaml                   |  12 ++--
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/backend_deploy.yml b/.github/workflows/backend_deploy.yml
index ce886347..f370d337 100644
--- a/.github/workflows/backend_deploy.yml
+++ b/.github/workflows/backend_deploy.yml
@@ -1,54 +1,54 @@
-name: gin-vue-admin backend deploy
-
-on:
-  push:
-    branches: 
-      - master
-    paths:
-      - './server/**'
-
-jobs:
-
-  deploy:
-    name: Backend deploy
-    runs-on: [ self-hosted ]
-    steps:
-
-    - name: Check out the repository
-      uses: actions/checkout@master
-
-    - name: Show files
-      run: |
-        pwd
-        ls -la
-
-    - name: Get dependencies
-      run: |
-        go get -v -t -d ./...
-        if [ -f Gopkg.toml ]; then
-            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-            dep ensure
-        fi
-      working-directory: ./server
-
-    - name: Build
-      run: |
-        go build -o run -v
-      working-directory: ./server
-
-    - name: Modify config params
-      run: |
-        sed -i 's/%{mysql_address}/'$MYSQL_ADDR'/' config.yaml
-        sed -i 's/%{mysql_username}/'$MYSQL_USERNAME'/' config.yaml
-        sed -i 's/%{mysql_password}/'$MSQL_PASSWORD'/' config.yaml
-        sed -i 's/%{redis_address}/'$REDIS_ADDR'/' config.yaml
-        sed -i 's/%{redis_password}/'$REDIS_PASSWORD'/' config.yaml
-      working-directory: ./server
+# name: gin-vue-admin backend deploy
+
+# on:
+#   push:
+#     branches: 
+#       - master
+#     paths:
+#       - './server/**'
+
+# jobs:
+
+#   deploy:
+#     name: Backend deploy
+#     runs-on: [ self-hosted ]
+#     steps:
+
+#     - name: Check out the repository
+#       uses: actions/checkout@master
+
+#     - name: Show files
+#       run: |
+#         pwd
+#         ls -la
+
+#     - name: Get dependencies
+#       run: |
+#         go get -v -t -d ./...
+#         if [ -f Gopkg.toml ]; then
+#             curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+#             dep ensure
+#         fi
+#       working-directory: ./server
+
+#     - name: Build
+#       run: |
+#         go build -o run -v
+#       working-directory: ./server
+
+#     - name: Modify config params
+#       run: |
+#         sed -i 's/%{mysql_address}/'$MYSQL_ADDR'/' config.yaml
+#         sed -i 's/%{mysql_username}/'$MYSQL_USERNAME'/' config.yaml
+#         sed -i 's/%{mysql_password}/'$MSQL_PASSWORD'/' config.yaml
+#         sed -i 's/%{redis_address}/'$REDIS_ADDR'/' config.yaml
+#         sed -i 's/%{redis_password}/'$REDIS_PASSWORD'/' config.yaml
+#       working-directory: ./server
     
-    - name: Run Dockerfile
-      run: |
-        echo 'There is nothing for the time being' 
-      working-directory: ./server
+#     - name: Run Dockerfile
+#       run: |
+#         echo 'There is nothing for the time being' 
+#       working-directory: ./server
       
     
 
diff --git a/server/config.yaml b/server/config.yaml
index 2e5b3cd5..55f0b0d6 100644
--- a/server/config.yaml
+++ b/server/config.yaml
@@ -10,9 +10,9 @@ jwt:
 
 # mysql connect configuration
 mysql:
-    username: %{mysql_username}
-    password: %{mysql_password}
-    path: %{mysql_address}
+    username: root
+    password: 'Aa@6447985'
+    path: '127.0.0.1:3306'
     db-name: 'qmPlus'
     config: 'charset=utf8&parseTime=True&loc=Local'
     max-idle-conns: 10
@@ -33,8 +33,8 @@ qiniu:
     img-path: 'http://qmplusimg.henrongyi.top'
 # redis configuration
 redis:
-    addr: %{redis_address}
-    passwprd: %{redis_password}
+    addr: '127.0.0.1:6379'
+    password: ''
     db: 0
 
 # system configuration
@@ -55,4 +55,4 @@ log:
     prefix: '[GIN-VUE-ADMIN]'
     log-file: true
     stdout: 'DEBUG'
-    file: 'DEBUG'
+    file: 'DEBUG'
\ No newline at end of file
-- 
GitLab